From 2515aee15a12dbdcacedeefa9afcb9890bc4dc0b Mon Sep 17 00:00:00 2001 From: timkeane Date: Wed, 23 Nov 2016 10:14:08 -0500 Subject: [PATCH] update versions of dependent js libs --- build.gradle | 4 +- etc/jsdoc/layout.tmpl | 258 ++++++++-------- examples/carto-popup.html | 232 +++++++-------- examples/choice.html | 132 ++++----- examples/dialog.html | 102 +++---- examples/lang-button.html | 104 +++---- examples/lang-menu.html | 102 +++---- examples/leaf-controls.html | 188 ++++++------ examples/leaf-feature-search.html | 214 +++++++------- examples/leaf-locationmgr.html | 150 +++++----- examples/ol-controls.html | 208 ++++++------- examples/ol-csv.html | 200 ++++++------- examples/ol-facility-container-min.html | 106 +++---- examples/ol-facility-container-no-list.html | 106 +++---- examples/ol-facility-container.html | 2 +- examples/ol-facility-iframe.html | 120 ++++---- examples/ol-feature-search.html | 232 +++++++-------- examples/ol-filteringandsorting.html | 310 ++++++++++---------- examples/ol-locationmgr.html | 170 +++++------ examples/ol-nyc-open-data.html | 200 ++++++------- examples/ol-redline-draw.html | 4 +- examples/ol-redline-getfeature.html | 4 +- gradle/wrapper/gradle-wrapper.jar | Bin 54224 -> 52928 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 20 +- src/test/index.html | 268 ++++++++--------- 26 files changed, 1719 insertions(+), 1721 deletions(-) diff --git a/build.gradle b/build.gradle index d95a7a92..01db97ec 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ dependencies { ext { appName = 'nyc-lib' - ver = 'v0.2.3-SNAPSHOT' + ver = 'v0.2.3' pkgDir = "${buildDir}/${appName}/${ver}" remoteDir = "${appName}/${ver}" srcDir = "${projectDir}/src/main" @@ -493,5 +493,5 @@ jettyStop.doFirst { } task wrapper(type: Wrapper) { - gradleVersion '3.2' + gradleVersion '3.1' } diff --git a/etc/jsdoc/layout.tmpl b/etc/jsdoc/layout.tmpl index 554be82c..6572884d 100644 --- a/etc/jsdoc/layout.tmpl +++ b/etc/jsdoc/layout.tmpl @@ -1,129 +1,129 @@ - - - - - nyc-lib: <?js= title ?> - - - - - - - - - - - - -
- -

- - Source: - - - - maps.nyc.gov -

- - -
-
-

nyc-lib (version @@NYC-LIB-VER@@)

-
- A collection of javascript libraries used in the development New York City mapping applications. -
-
-
-
-

- All of these libraries depend on Proj4js, - JQuery - and rendering is enhanced by JQuery Mobile. -

-

- The nyc-lib javascript libraries - provide various javascript classes to interact with New York City data and - provide a standard UX across mapping applications. -

-

- These libraries provide functionality for applications utilizing - OpenLayer 3, - Leaflet, - CartoDB and - ChartJS. -

-

Examples...

- -

nyc-ol-lib (OpenLayers)

- - - -

nyc-ol-redline-lib (OpenLayers)

- - - -

nyc-carto-lib (CartoDB and ChartJS)

- - - -

nyc-leaf-lib (Leaflet)

- - - -
-
-
- - - - -
- - - -
- - - - - - - - + + + + + nyc-lib: <?js= title ?> + + + + + + + + + + + + +
+ +

+ + Source: + + + + maps.nyc.gov +

+ + +
+
+

nyc-lib (version @@NYC-LIB-VER@@)

+
+ A collection of javascript libraries used in the development New York City mapping applications. +
+
+
+
+

+ All of these libraries depend on Proj4js, + JQuery + and rendering is enhanced by JQuery Mobile. +

+

+ The nyc-lib javascript libraries + provide various javascript classes to interact with New York City data and + provide a standard UX across mapping applications. +

+

+ These libraries provide functionality for applications utilizing + OpenLayer 3, + Leaflet, + CartoDB and + ChartJS. +

+

Examples...

+ +

nyc-ol-lib (OpenLayers)

+ + + +

nyc-ol-redline-lib (OpenLayers)

+ + + +

nyc-carto-lib (CartoDB and ChartJS)

+ + + +

nyc-leaf-lib (Leaflet)

+ + + +
+
+
+ + + + +
+ + + +
+ + + + + + + + diff --git a/examples/carto-popup.html b/examples/carto-popup.html index 1bf8bf8f..a6541494 100644 --- a/examples/carto-popup.html +++ b/examples/carto-popup.html @@ -1,116 +1,116 @@ - - - - - CartoDB Example - - - - - - - - - - - - - - - - - - - - - -
-
-
- x -
-
-
{{name}}
-
-
{{crime_count}} {{type}}
-
-
-
- {{per1000}} - {{type}} per 1000 residents -
-
Population {{pop}}
-
-
-
-
-
{{name}}
-
-
-
-
-
- - - + + + + + CartoDB Example + + + + + + + + + + + + + + + + + + + + + +
+
+
+ x +
+
+
{{name}}
+
+
{{crime_count}} {{type}}
+
+
+
+ {{per1000}} + {{type}} per 1000 residents +
+
Population {{pop}}
+
+
+
+
+
{{name}}
+
+
+
+
+
+ + + diff --git a/examples/choice.html b/examples/choice.html index abad58d1..37bf1917 100644 --- a/examples/choice.html +++ b/examples/choice.html @@ -1,66 +1,66 @@ - - - - - nyc.Check and nyc.Radio Example - - - - - - - - - - - - - - - - - - - - -
-
- - - + + + + + nyc.Check and nyc.Radio Example + + + + + + + + + + + + + + + + + + + + +
+
+ + + diff --git a/examples/dialog.html b/examples/dialog.html index 4e399468..7ef2f621 100644 --- a/examples/dialog.html +++ b/examples/dialog.html @@ -1,51 +1,51 @@ - - - - - nyc.Dialog Example - - - - - - - - - - - - - - - - - - - - - - - - + + + + + nyc.Dialog Example + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/lang-button.html b/examples/lang-button.html index 078c10ee..2d746216 100644 --- a/examples/lang-button.html +++ b/examples/lang-button.html @@ -1,52 +1,52 @@ - - - - - nyc.Lang Example - - - - - - - - - - - - - - - - - - -
Something to translate
-
Something not to translate
-
- - - + + + + + nyc.Lang Example + + + + + + + + + + + + + + + + + + +
Something to translate
+
Something not to translate
+
+ + + diff --git a/examples/lang-menu.html b/examples/lang-menu.html index 62cc8963..30f90cb7 100644 --- a/examples/lang-menu.html +++ b/examples/lang-menu.html @@ -1,51 +1,51 @@ - - - - - nyc.Lang Example - - - - - - - - - - - - - - - - - - -
Something to translate
-
Something not to translate
-
- - - + + + + + nyc.Lang Example + + + + + + + + + + + + + + + + + + +
Something to translate
+
Something not to translate
+
+ + + diff --git a/examples/leaf-controls.html b/examples/leaf-controls.html index 604547ef..03490262 100644 --- a/examples/leaf-controls.html +++ b/examples/leaf-controls.html @@ -1,94 +1,94 @@ - - - - - Leaflet Example - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - + + + + + Leaflet Example + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/examples/leaf-feature-search.html b/examples/leaf-feature-search.html index 7b1c9d66..6d01540a 100644 --- a/examples/leaf-feature-search.html +++ b/examples/leaf-feature-search.html @@ -1,107 +1,107 @@ - - - - - Leaflet Example - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - + + + + + Leaflet Example + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/examples/leaf-locationmgr.html b/examples/leaf-locationmgr.html index 09827d14..55e42db3 100644 --- a/examples/leaf-locationmgr.html +++ b/examples/leaf-locationmgr.html @@ -1,75 +1,75 @@ - - - - - Leaflet Example - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - + + + + + Leaflet Example + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/examples/ol-controls.html b/examples/ol-controls.html index fb237f75..0004e3fe 100644 --- a/examples/ol-controls.html +++ b/examples/ol-controls.html @@ -1,104 +1,104 @@ - - - - - OpenLayers Example - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - + + + + + OpenLayers Example + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/examples/ol-csv.html b/examples/ol-csv.html index 89c51469..bcfd4eab 100644 --- a/examples/ol-csv.html +++ b/examples/ol-csv.html @@ -1,100 +1,100 @@ - - - - - OpenLayers Example - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - + + + + + OpenLayers Example + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/examples/ol-facility-container-min.html b/examples/ol-facility-container-min.html index 2728c7f2..30377f91 100644 --- a/examples/ol-facility-container-min.html +++ b/examples/ol-facility-container-min.html @@ -1,54 +1,54 @@ - - - - - OpenLayers Example - - - - - - - - - - -
See nyc.template.facility.MapConfig for configuration details
- + + + + + OpenLayers Example + + + + + + + + + + +
See nyc.template.facility.MapConfig for configuration details
+ \ No newline at end of file diff --git a/examples/ol-facility-container-no-list.html b/examples/ol-facility-container-no-list.html index fdf50993..3d9cfba0 100644 --- a/examples/ol-facility-container-no-list.html +++ b/examples/ol-facility-container-no-list.html @@ -1,54 +1,54 @@ - - - - - OpenLayers Example - - - - - - -
See nyc.template.facility.MapConfig for configuration details
- + + + + + OpenLayers Example + + + + + + +
See nyc.template.facility.MapConfig for configuration details
+ \ No newline at end of file diff --git a/examples/ol-facility-container.html b/examples/ol-facility-container.html index adf1f308..608bb6c1 100644 --- a/examples/ol-facility-container.html +++ b/examples/ol-facility-container.html @@ -28,7 +28,7 @@ font-family: Arial; } - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
-
- - -
- maps.nyc.gov

maps.nyc.gov

-
- - + + + + + OpenLayers Example + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+
+ + +
+ maps.nyc.gov

maps.nyc.gov

+
+ + diff --git a/examples/ol-feature-search.html b/examples/ol-feature-search.html index 1dea85f1..ca0d7219 100644 --- a/examples/ol-feature-search.html +++ b/examples/ol-feature-search.html @@ -1,116 +1,116 @@ - - - - - OpenLayers Example - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - + + + + + OpenLayers Example + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/examples/ol-filteringandsorting.html b/examples/ol-filteringandsorting.html index c54d850b..3981e22d 100644 --- a/examples/ol-filteringandsorting.html +++ b/examples/ol-filteringandsorting.html @@ -1,155 +1,155 @@ - - - - - OpenLayers Example - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - + + + + + OpenLayers Example + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + diff --git a/examples/ol-locationmgr.html b/examples/ol-locationmgr.html index 03820bae..2a083405 100644 --- a/examples/ol-locationmgr.html +++ b/examples/ol-locationmgr.html @@ -1,85 +1,85 @@ - - - - - OpenLayers Example - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - + + + + + OpenLayers Example + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/examples/ol-nyc-open-data.html b/examples/ol-nyc-open-data.html index c3d361fe..9a511880 100644 --- a/examples/ol-nyc-open-data.html +++ b/examples/ol-nyc-open-data.html @@ -1,100 +1,100 @@ - - - - - OpenLayers Example - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - + + + + + OpenLayers Example + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/examples/ol-redline-draw.html b/examples/ol-redline-draw.html index d757ec35..1d62ca03 100644 --- a/examples/ol-redline-draw.html +++ b/examples/ol-redline-draw.html @@ -13,9 +13,9 @@ - + - + diff --git a/examples/ol-redline-getfeature.html b/examples/ol-redline-getfeature.html index eb7c7777..8a92f4b3 100644 --- a/examples/ol-redline-getfeature.html +++ b/examples/ol-redline-getfeature.html @@ -13,9 +13,9 @@ - + - + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d6e2637affb74a80bfbe87bd2da57e81b2f3c661..6ffa237849ef3607e39c3b334a92a65367962071 100644 GIT binary patch delta 13961 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 y-Dd3fn diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1caa619b..32bf0d8c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Nov 22 09:50:44 EST 2016 +#Wed Nov 23 10:07:22 EST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip diff --git a/gradlew b/gradlew index 4ef3a871..9aa616c2 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash ############################################################################## ## @@ -154,18 +154,16 @@ if $cygwin ; then esac fi -# Escape application args -for s in "${@}" ; do - s=\"$s\" - APP_ARGS=$APP_ARGS" "$s -done - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- "$DEFAULT_JVM_OPTS" "$JAVA_OPTS" "$GRADLE_OPTS" "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then +if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then cd "$(dirname "$0")" fi -exec "$JAVACMD" "$@" +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/src/test/index.html b/src/test/index.html index 6dd076bf..8d527173 100644 --- a/src/test/index.html +++ b/src/test/index.html @@ -1,134 +1,134 @@ - - - - - nyc-lib QUnit Tests - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + nyc-lib QUnit Tests + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +