diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 42f805d2ed..2829735d76 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -7,3 +7,5 @@ # jsdoc linting updates f39996085682acc91ef3474bb2c3732dd9646c04 +# linting updates +f5a6b86a4cafd83f39be6b9a32e27f7856bfc8a3 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8a2ce71e41..0253be1eea 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -30,6 +30,11 @@ repos: - id: forbid-new-submodules - id: mixed-line-ending - id: trailing-whitespace + - id: pretty-format-json + args: + - '--autofix' + - '--no-sort-keys' + exclude: (package-lock|capitals|proj|states|data)\.json - repo: https://github.com/pre-commit/pygrep-hooks rev: v1.10.0 hooks: diff --git a/examples/animation/example.json b/examples/animation/example.json index 0847f7472f..30c9197453 100644 --- a/examples/animation/example.json +++ b/examples/animation/example.json @@ -1,7 +1,11 @@ { "title": "Animate Features", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example shows how to animate features by updating styles." } diff --git a/examples/annotations/example.json b/examples/annotations/example.json index bdfaff9146..031cae5f58 100644 --- a/examples/annotations/example.json +++ b/examples/annotations/example.json @@ -1,7 +1,11 @@ { "title": "Annotation Layer", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "thumbquery": "labels=false&geojson=%7B%22type%22%3A%22FeatureCollection%22%2C%22features%22%3A%5B%7B%22type%22%3A%22Feature%22%2C%22geometry%22%3A%7B%22type%22%3A%22Point%22%2C%22coordinates%22%3A%5B-118.8726%2C36.6962%5D%7D%2C%22properties%22%3A%7B%22annotationType%22%3A%22point%22%2C%22fillColor%22%3A%22%2300ff00%22%2C%22fillOpacity%22%3A0.25%2C%22radius%22%3A10%2C%22strokeWidth%22%3A3%7D%7D%2C%7B%22type%22%3A%22Feature%22%2C%22geometry%22%3A%7B%22type%22%3A%22Point%22%2C%22coordinates%22%3A%5B-119.7193%2C36.7762%5D%7D%2C%22properties%22%3A%7B%22annotationType%22%3A%22point%22%2C%22fillColor%22%3A%22%2300ff00%22%2C%22fillOpacity%22%3A0.25%2C%22radius%22%3A10%2C%22strokeWidth%22%3A3%7D%7D%2C%7B%22type%22%3A%22Feature%22%2C%22geometry%22%3A%7B%22type%22%3A%22Polygon%22%2C%22coordinates%22%3A%5B%5B%5B-118.9165%2C36.5975%5D%2C%5B-118.8952%2C36.5788%5D%2C%5B-118.9068%2C36.5624%5D%2C%5B-118.8786%2C36.5398%5D%2C%5B-118.8796%2C36.4883%5D%2C%5B-118.7641%2C36.4867%5D%2C%5B-118.7689%2C36.3508%5D%2C%5B-118.7340%2C36.3453%5D%2C%5B-118.7116%2C36.3414%5D%2C%5B-118.6912%2C36.3531%5D%2C%5B-118.6893%2C36.3938%5D%2C%5B-118.5873%2C36.3953%5D%2C%5B-118.5504%2C36.4078%5D%2C%5B-118.5397%2C36.3899%5D%2C%5B-118.4825%2C36.3578%5D%2C%5B-118.4922%2C36.3476%5D%2C%5B-118.4815%2C36.3265%5D%2C%5B-118.4504%2C36.3085%5D%2C%5B-118.4135%2C36.3343%5D%2C%5B-118.3844%2C36.3633%5D%2C%5B-118.3737%2C36.3860%5D%2C%5B-118.3601%2C36.4383%5D%2C%5B-118.3319%2C36.4493%5D%2C%5B-118.2475%2C36.4828%5D%2C%5B-118.2358%2C36.4969%5D%2C%5B-118.2426%2C36.5242%5D%2C%5B-118.2630%2C36.5507%5D%2C%5B-118.2892%2C36.5554%5D%2C%5B-118.2882%2C36.5850%5D%2C%5B-118.2766%2C36.5960%5D%2C%5B-118.2873%2C36.6053%5D%2C%5B-118.3193%2C36.6287%5D%2C%5B-118.3368%2C36.6591%5D%2C%5B-118.3300%2C36.6645%5D%2C%5B-118.3397%2C36.6739%5D%2C%5B-118.3465%2C36.6731%5D%2C%5B-118.3815%2C36.7019%5D%2C%5B-118.4310%2C36.6957%5D%2C%5B-118.4320%2C36.6801%5D%2C%5B-118.4465%2C36.6863%5D%2C%5B-118.4747%2C36.6684%5D%2C%5B-118.4747%2C36.6529%5D%2C%5B-118.4863%2C36.6490%5D%2C%5B-118.4834%2C36.6365%5D%2C%5B-118.5252%2C36.5983%5D%2C%5B-118.5310%2C36.5936%5D%2C%5B-118.5563%2C36.5983%5D%2C%5B-118.5687%2C36.5967%5D%2C%5B-118.5842%2C36.6045%5D%2C%5B-118.5813%2C36.6139%5D%2C%5B-118.6017%2C36.6108%5D%2C%5B-118.6163%2C36.6279%5D%2C%5B-118.6396%2C36.6388%5D%2C%5B-118.6473%2C36.6318%5D%2C%5B-118.6580%2C36.6326%5D%2C%5B-118.6609%2C36.6396%5D%2C%5B-118.6716%2C36.6373%5D%2C%5B-118.6794%2C36.6357%5D%2C%5B-118.6978%2C36.6404%5D%2C%5B-118.7066%2C36.6645%5D%2C%5B-118.7454%2C36.6786%5D%2C%5B-118.7755%2C36.6786%5D%2C%5B-118.7978%2C36.6770%5D%2C%5B-118.8202%2C36.6684%5D%2C%5B-118.8211%2C36.6599%5D%2C%5B-118.8367%2C36.6505%5D%2C%5B-118.8474%2C36.6513%5D%2C%5B-118.8542%2C36.6419%5D%2C%5B-118.8697%2C36.6334%5D%2C%5B-118.8804%2C36.6225%5D%2C%5B-118.9024%2C36.6209%5D%2C%5B-118.9121%2C36.6084%5D%2C%5B-118.9165%2C36.5975%5D%5D%5D%7D%2C%22properties%22%3A%7B%22annotationType%22%3A%22polygon%22%2C%22fillColor%22%3A%22%2300ff00%22%2C%22fillOpacity%22%3A0.25%2C%22strokeColor%22%3A%22%23000000%22%2C%22strokeWidth%22%3A3%7D%7D%5D%7D", "about": { "text": "This example shows how to add annotations, such as marked rectangles, to a map." diff --git a/examples/blog-lines/example.json b/examples/blog-lines/example.json index 553e3a6021..d7bba816c7 100644 --- a/examples/blog-lines/example.json +++ b/examples/blog-lines/example.json @@ -1,8 +1,12 @@ { "title": "Blog entry on line drawing", "hideNavbar": true, - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "about": { "text": "This is used to show comparisons for the blog post on lines." }, diff --git a/examples/choropleth/example.json b/examples/choropleth/example.json index d02a1b01a6..90bb1dc650 100644 --- a/examples/choropleth/example.json +++ b/examples/choropleth/example.json @@ -1,6 +1,8 @@ { "title": "Choropleth plot", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example shows how to add choropleth features to a map. Choropleths color each region in a set of regions based on a scalar value for each region." } diff --git a/examples/cluster/example.json b/examples/cluster/example.json index 4f522d9dfc..d7515b2df5 100644 --- a/examples/cluster/example.json +++ b/examples/cluster/example.json @@ -1,7 +1,11 @@ { "title": "Cluster points", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "about": { "text": "Cluster nearby points on a map." } diff --git a/examples/color-legend/example.json b/examples/color-legend/example.json index 22a9935ebf..17bf59076d 100644 --- a/examples/color-legend/example.json +++ b/examples/color-legend/example.json @@ -1,6 +1,8 @@ { "title": "Color legends", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example shows how to create a discrete or continuous color legends." }, diff --git a/examples/contour/example.json b/examples/contour/example.json index b3e5824d83..7eab0dc5ce 100644 --- a/examples/contour/example.json +++ b/examples/contour/example.json @@ -1,24 +1,33 @@ { "title": "Contour plot", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example shows how to add contour features to a map. Contours color a region based on an array of scalar values. If stepped colors are used, these are called isobands." }, - "tests": [{ - "description": "contour feature loads small dataset", - "query": "url=../../data/oahu.json", - "wait": ["example.ready"], - "tests": [ - "example.contour instanceof geo.contourFeature", - "example.contour._createContours().value.length === 1953" - ] - }, { - "description": "contour feature loads dense dataset", - "query": "url=../../data/oahu-dense.json", - "wait": ["example.ready"], - "tests": [ - "example.contour instanceof geo.contourFeature", - "example.contour._createContours().value.length === 194770" - ] - }] + "tests": [ + { + "description": "contour feature loads small dataset", + "query": "url=../../data/oahu.json", + "wait": [ + "example.ready" + ], + "tests": [ + "example.contour instanceof geo.contourFeature", + "example.contour._createContours().value.length === 1953" + ] + }, + { + "description": "contour feature loads dense dataset", + "query": "url=../../data/oahu-dense.json", + "wait": [ + "example.ready" + ], + "tests": [ + "example.contour instanceof geo.contourFeature", + "example.contour._createContours().value.length === 194770" + ] + } + ] } diff --git a/examples/deepzoom/example.json b/examples/deepzoom/example.json index cb4817567e..0f56d419be 100644 --- a/examples/deepzoom/example.json +++ b/examples/deepzoom/example.json @@ -1,15 +1,21 @@ { "title": "Deep Zoom tiled image example", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "Rendering a tiled image using the Deep Zoom protocol." }, - "disable-tests": [{ - "description": "data is loaded from the Deep Zoom server", - "idle": ["$('#map.geojs-map').data('data-geojs-map').onIdle"], - "tests": [ - "Object.keys($('#map.geojs-map').data('data-geojs-map').layers()[0]._activeTiles).length === 11" - ] - }], + "disable-tests": [ + { + "description": "data is loaded from the Deep Zoom server", + "idle": [ + "$('#map.geojs-map').data('data-geojs-map').onIdle" + ], + "tests": [ + "Object.keys($('#map.geojs-map').data('data-geojs-map').layers()[0]._activeTiles).length === 11" + ] + } + ], "disabled": true } diff --git a/examples/dynamicData/example.json b/examples/dynamicData/example.json index 49a40c8106..4e89bca3ce 100644 --- a/examples/dynamicData/example.json +++ b/examples/dynamicData/example.json @@ -1,6 +1,9 @@ { "title": "Dynamic Data", - "exampleJs": ["main.js", "clock.js"], + "exampleJs": [ + "main.js", + "clock.js" + ], "about": { "text": "Rendering data that changes with time." }, diff --git a/examples/flights/example.json b/examples/flights/example.json index 8b2293d20d..066c4b00db 100644 --- a/examples/flights/example.json +++ b/examples/flights/example.json @@ -1,8 +1,14 @@ { "title": "Flight tracking data", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], - "docJs": ["worker.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], + "docJs": [ + "worker.js" + ], "about": { "text": "Recent flights from The OpenSky Network on an interactive map." }, diff --git a/examples/geoJSON/example.json b/examples/geoJSON/example.json index 1819ff123c..74067e6939 100644 --- a/examples/geoJSON/example.json +++ b/examples/geoJSON/example.json @@ -1,7 +1,11 @@ { "title": "GeoJSON file reader", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "about": { "text": "Shows how to use the included geoJSON reader, and how to use the properties to adjust the style of the features. In this example, you can edit the json file while the features on the map update in response. You can also drop a new geoJSON file onto the text editor to load it." } diff --git a/examples/heatmap/example.json b/examples/heatmap/example.json index ad07be0f4b..b40a6f45df 100644 --- a/examples/heatmap/example.json +++ b/examples/heatmap/example.json @@ -1,7 +1,11 @@ { "title": "Heatmap Feature", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example shows how to add a heatmap to a map." } diff --git a/examples/hurricanes/example.json b/examples/hurricanes/example.json index b3b3196769..566397fbb8 100644 --- a/examples/hurricanes/example.json +++ b/examples/hurricanes/example.json @@ -1,7 +1,11 @@ { "title": "Hurricane tracking data", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "level": 0, "order": 0, "about": { diff --git a/examples/isoline/example.json b/examples/isoline/example.json index dada5b6980..3c10ddd22f 100644 --- a/examples/isoline/example.json +++ b/examples/isoline/example.json @@ -1,15 +1,21 @@ { "title": "Isolines", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example shows how to add isolines to a map." }, - "tests": [{ - "description": "isoline feature is loaded and has text", - "wait": ["example.ready"], - "tests": [ - "example.iso instanceof geo.isolineFeature", - "example.isolineLayer.children()[2].features()[0] instanceof geo.textFeature" - ] - }] + "tests": [ + { + "description": "isoline feature is loaded and has text", + "wait": [ + "example.ready" + ], + "tests": [ + "example.iso instanceof geo.isolineFeature", + "example.isolineLayer.children()[2].features()[0] instanceof geo.textFeature" + ] + } + ] } diff --git a/examples/layerEvents/example.json b/examples/layerEvents/example.json index 45f03f6daa..c5e6c7f1dd 100644 --- a/examples/layerEvents/example.json +++ b/examples/layerEvents/example.json @@ -1,7 +1,11 @@ { "title": "DOM events in layers", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example shows how native DOM events can be used within layers. SVG elements placed inside the layer will only receive mouse events when they are inside the top layer. The elements inside the current top layer can choose to block certain events to override the default mouse interaction." }, diff --git a/examples/layers/example.json b/examples/layers/example.json index 56941dfb24..d703f9fed8 100644 --- a/examples/layers/example.json +++ b/examples/layers/example.json @@ -1,7 +1,11 @@ { "title": "Raw layer interface", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example demonstrates drawing directly into GeoJS layers without using the feature API. Layers come in two flavors, fixed and moving. Fixed layers remain in a fixed screen position, while moving layers remain fixed relative to the map. In addition, you may choose to rescale one or more properties in moving layers." }, diff --git a/examples/legend/example.json b/examples/legend/example.json index 78efc1fd60..5b4284abd9 100644 --- a/examples/legend/example.json +++ b/examples/legend/example.json @@ -1,6 +1,8 @@ { "title": "Feature legends", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example shows how to create a legend to describe feature styles on a map." } diff --git a/examples/lines/example.json b/examples/lines/example.json index c04bd3b649..7c42ed094d 100644 --- a/examples/lines/example.json +++ b/examples/lines/example.json @@ -1,7 +1,11 @@ { "title": "Line Feature", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "thumbquery": "lines=250000&lineCap=round&strokeWidth=%7B%22residential%22%3A1%2C%22service%22%3A0.25%2C%22other%22%3A3%7D", "about": { "text": "This example shows the variations that are available for line features." diff --git a/examples/measure/example.json b/examples/measure/example.json index 8ab8f19435..32be6d182f 100644 --- a/examples/measure/example.json +++ b/examples/measure/example.json @@ -1,7 +1,11 @@ { "title": "Measure Annotations", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "thumbquery": "geojson=%7B%22type%22%3A%22FeatureCollection%22%2C%22features%22%3A%5B%7B%22type%22%3A%22Feature%22%2C%22geometry%22%3A%7B%22type%22%3A%22Polygon%22%2C%22coordinates%22%3A%5B%5B%5B-81.3097384645104%2C42.65492085605453%5D%2C%5B-81.81622784983621%2C42.38178837433503%5D%2C%5B-81.8386672529836%2C42.256164224769044%5D%2C%5B-82.01497684914128%2C42.2670773912705%5D%2C%5B-82.43749837001597%2C42.09970738252012%5D%2C%5B-82.50716685749767%2C41.91174339353861%5D%2C%5B-82.61736203222013%2C42.03878828744648%5D%2C%5B-82.92537549111928%2C41.97604892354537%5D%2C%5B-83.13053574846643%2C42.059880307328555%5D%2C%5B-83.46905017308926%2C41.74302954779669%5D%2C%5B-82.91905112680716%2C41.51494851649117%5D%2C%5B-82.83895384814592%2C41.58592790319722%5D%2C%5B-82.70553016588629%2C41.52877921728836%5D%2C%5B-82.9756092275456%2C41.46532025476897%5D%2C%5B-82.94033861894106%2C41.42223637904752%5D%2C%5B-82.48906236933666%2C41.382341348529515%5D%2C%5B-82.06370241026121%2C41.52068300446072%5D%2C%5B-81.76109103067415%2C41.48611223128468%5D%2C%5B-81.28681796221682%2C41.7597825851095%5D%2C%5B-80.110677833162%2C42.1255914727342%5D%2C%5B-79.34953504035339%2C42.485397723765615%5D%2C%5B-78.8417917871286%2C42.788087900825694%5D%2C%5B-78.90283450010408%2C42.893105848622966%5D%2C%5B-80.18819365804282%2C42.78965660572887%5D%2C%5B-80.43256221867617%2C42.61996238633441%5D%2C%5B-80.05313188825906%2C42.552990303025574%5D%2C%5B-80.10955095902953%2C42.53787529773383%5D%2C%5B-80.58273793488254%2C42.58043355589163%5D%2C%5B-80.93119651796614%2C42.66052107372758%5D%2C%5B-81.3097384645104%2C42.65492085605453%5D%5D%5D%7D%2C%22properties%22%3A%7B%22annotationType%22%3A%22polygon%22%2C%22name%22%3A%22Lake%20Erie%22%2C%22annotationId%22%3A3%2C%22fill%22%3Atrue%2C%22fillColor%22%3A%22%2300ff00%22%2C%22fillOpacity%22%3A0.25%2C%22stroke%22%3Atrue%2C%22strokeColor%22%3A%22%23000000%22%2C%22strokeOpacity%22%3A1%2C%22strokeWidth%22%3A3%2C%22labelTextAlign%22%3A%22center%22%2C%22labelTextBaseline%22%3A%22middle%22%2C%22labelColor%22%3A%22%23000000%22%2C%22labelRotateWithMap%22%3Afalse%2C%22labelShadowRotate%22%3A%22false%22%7D%7D%5D%7D&distunit=si&areaunit=si", "about": { "text": "Show lengths and areas of annotations. This shows how annotations can be altered while being drawn. Areas are computed using an equal-area projection." diff --git a/examples/osm/example.json b/examples/osm/example.json index 930618c192..1c3ea285af 100644 --- a/examples/osm/example.json +++ b/examples/osm/example.json @@ -1,6 +1,8 @@ { "title": "Open street map layer", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "Basic map rendering tiles from an OpenStreetMap tile server. The base url for the tile server is given at initialization to provide a custom appearance." }, diff --git a/examples/picking/example.json b/examples/picking/example.json index b6117127a8..da815e0e65 100644 --- a/examples/picking/example.json +++ b/examples/picking/example.json @@ -1,6 +1,9 @@ { "title": "Mouse picking for points and lines", - "exampleJs": ["main.js", "widget.js"], + "exampleJs": [ + "main.js", + "widget.js" + ], "about": { "text": "This example demonstrates how to attach handlers to various mouse interactions that allow the users to select features. Try moving the mouse over the features and clicking." }, diff --git a/examples/pixelmap/example.json b/examples/pixelmap/example.json index 0f2afe9070..18a2b70c5c 100644 --- a/examples/pixelmap/example.json +++ b/examples/pixelmap/example.json @@ -1,6 +1,8 @@ { "title": "Pixelmap feature", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example shows how to use a pixelmap feature. The pixelmap colors areas based on an index derived from an image and some data per index." } diff --git a/examples/pixelmap/pixelmap.json b/examples/pixelmap/pixelmap.json index fa7a59238d..b5674b0aaa 100644 --- a/examples/pixelmap/pixelmap.json +++ b/examples/pixelmap/pixelmap.json @@ -1 +1,213 @@ -[{"name": "background"}, {"name": "Arizona", "value": "D"}, {"name": "Arkansas", "value": "R"}, {"name": "California", "value": "D"}, {"name": "Colorado", "value": "D"}, {"name": "Connecticut", "value": "D"}, {"name": "District of Columbia", "value": "D"}, {"name": "Georgia", "value": "R"}, {"name": "Hawaii", "value": "D"}, {"name": "Illinois", "value": "D"}, {"name": "Indiana", "value": "R"}, {"name": "Louisiana", "value": "R"}, {"name": "Minnesota", "value": "D"}, {"name": "Mississippi", "value": "R"}, {"name": "Montana", "value": "R"}, {"name": "New Mexico", "value": "D"}, {"name": "North Dakota", "value": "R"}, {"name": "Oklahoma", "value": "R"}, {"name": "Pennsylvania", "value": "D"}, {"name": "Tennessee", "value": "R"}, {"name": "Virginia", "value": "D"}, {"name": "Puerto Rico", "value": null}, {"name": "Delaware", "value": "D"}, {"name": "West Virginia", "value": "R"}, {"name": "Wisconsin", "value": "D"}, {"name": "Wyoming", "value": "R"}, {"name": "Alabama", "value": "R"}, {"name": "Alaska", "value": "R"}, {"name": "Florida", "value": "D"}, {"name": "Idaho", "value": "R"}, {"name": "Kansas", "value": "R"}, {"name": "Maryland", "value": "D"}, {"name": "New Jersey", "value": "D"}, {"name": "North Carolina", "value": "D"}, {"name": "South Carolina", "value": "R"}, {"name": "Washington", "value": "D"}, {"name": "Vermont", "value": "D"}, {"name": "Utah", "value": "R"}, {"name": "Iowa", "value": "D"}, {"name": "Kentucky", "value": "R"}, {"name": "Maine", "value": "D"}, {"name": "Massachusetts", "value": "D"}, {"name": "Michigan", "value": "D"}, {"name": "Missouri", "value": "R"}, {"name": "Nebraska", "value": "R"}, {"name": "Nevada", "value": "D"}, {"name": "New Hampshire", "value": "D"}, {"name": "New York", "value": "D"}, {"name": "Ohio", "value": "D"}, {"name": "Oregon", "value": "D"}, {"name": "Rhode Island", "value": "D"}, {"name": "South Dakota", "value": "R"}, {"name": "Texas", "value": "R"}] +[ + { + "name": "background" + }, + { + "name": "Arizona", + "value": "D" + }, + { + "name": "Arkansas", + "value": "R" + }, + { + "name": "California", + "value": "D" + }, + { + "name": "Colorado", + "value": "D" + }, + { + "name": "Connecticut", + "value": "D" + }, + { + "name": "District of Columbia", + "value": "D" + }, + { + "name": "Georgia", + "value": "R" + }, + { + "name": "Hawaii", + "value": "D" + }, + { + "name": "Illinois", + "value": "D" + }, + { + "name": "Indiana", + "value": "R" + }, + { + "name": "Louisiana", + "value": "R" + }, + { + "name": "Minnesota", + "value": "D" + }, + { + "name": "Mississippi", + "value": "R" + }, + { + "name": "Montana", + "value": "R" + }, + { + "name": "New Mexico", + "value": "D" + }, + { + "name": "North Dakota", + "value": "R" + }, + { + "name": "Oklahoma", + "value": "R" + }, + { + "name": "Pennsylvania", + "value": "D" + }, + { + "name": "Tennessee", + "value": "R" + }, + { + "name": "Virginia", + "value": "D" + }, + { + "name": "Puerto Rico", + "value": null + }, + { + "name": "Delaware", + "value": "D" + }, + { + "name": "West Virginia", + "value": "R" + }, + { + "name": "Wisconsin", + "value": "D" + }, + { + "name": "Wyoming", + "value": "R" + }, + { + "name": "Alabama", + "value": "R" + }, + { + "name": "Alaska", + "value": "R" + }, + { + "name": "Florida", + "value": "D" + }, + { + "name": "Idaho", + "value": "R" + }, + { + "name": "Kansas", + "value": "R" + }, + { + "name": "Maryland", + "value": "D" + }, + { + "name": "New Jersey", + "value": "D" + }, + { + "name": "North Carolina", + "value": "D" + }, + { + "name": "South Carolina", + "value": "R" + }, + { + "name": "Washington", + "value": "D" + }, + { + "name": "Vermont", + "value": "D" + }, + { + "name": "Utah", + "value": "R" + }, + { + "name": "Iowa", + "value": "D" + }, + { + "name": "Kentucky", + "value": "R" + }, + { + "name": "Maine", + "value": "D" + }, + { + "name": "Massachusetts", + "value": "D" + }, + { + "name": "Michigan", + "value": "D" + }, + { + "name": "Missouri", + "value": "R" + }, + { + "name": "Nebraska", + "value": "R" + }, + { + "name": "Nevada", + "value": "D" + }, + { + "name": "New Hampshire", + "value": "D" + }, + { + "name": "New York", + "value": "D" + }, + { + "name": "Ohio", + "value": "D" + }, + { + "name": "Oregon", + "value": "D" + }, + { + "name": "Rhode Island", + "value": "D" + }, + { + "name": "South Dakota", + "value": "R" + }, + { + "name": "Texas", + "value": "R" + } +] diff --git a/examples/points/example.json b/examples/points/example.json index 0e9f4428dc..64926a41b3 100644 --- a/examples/points/example.json +++ b/examples/points/example.json @@ -1,6 +1,8 @@ { "title": "Point features", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example shows how to add styled point features to a map. It also demonstrates attaching event handlers to add interactivity and combine events from multiple layers. Notice how GeoJS events propagate through features and layers." }, diff --git a/examples/polygons/example.json b/examples/polygons/example.json index 0173cef93e..8e42a6ca50 100644 --- a/examples/polygons/example.json +++ b/examples/polygons/example.json @@ -1,6 +1,8 @@ { "title": "Polygon features", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example shows how to add polygons to a map." } diff --git a/examples/quads/example.json b/examples/quads/example.json index f44d7c32eb..ef3e368976 100644 --- a/examples/quads/example.json +++ b/examples/quads/example.json @@ -1,6 +1,8 @@ { "title": "Quad features", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example shows how to add dynamic quads to a map." }, diff --git a/examples/rainfall/example.json b/examples/rainfall/example.json index a8ada5a5dc..466bf32f7c 100644 --- a/examples/rainfall/example.json +++ b/examples/rainfall/example.json @@ -1,19 +1,27 @@ { "title": "Rainfall - Annual precipitation totals", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "about": { "text": "Show isolines and contours of annual precipitation totals in the United States and nearby areas." }, - "tests": [{ - "description": "data is loaded and has isoline, isoline text, contour, and points", - "wait": ["year === 2010"], - "tests": [ - "iso instanceof geo.isolineFeature", - "layer.children().filter(function (c) { return c instanceof geo.layer; })[0].features()[0] instanceof geo.textFeature", - "iso.data().length === 30706", - "contour.data().length === 30706", - "point.data().length === 30706" - ] - }] + "tests": [ + { + "description": "data is loaded and has isoline, isoline text, contour, and points", + "wait": [ + "year === 2010" + ], + "tests": [ + "iso instanceof geo.isolineFeature", + "layer.children().filter(function (c) { return c instanceof geo.layer; })[0].features()[0] instanceof geo.textFeature", + "iso.data().length === 30706", + "contour.data().length === 30706", + "point.data().length === 30706" + ] + } + ] } diff --git a/examples/reprojection/example.json b/examples/reprojection/example.json index d2f4faae6d..6eb73afa7a 100644 --- a/examples/reprojection/example.json +++ b/examples/reprojection/example.json @@ -1,7 +1,11 @@ { "title": "Reproject tiles", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "thumbquery": "gcs=ESRI%3A54009", "about": { "text": "This example shows how you can reproject tiles from one projection to another. The source tiles are in Web Mercator (EPSG:3857), but can be drawn in many different projections." diff --git a/examples/sld/example.json b/examples/sld/example.json index 331a83c1c3..0b75ce82ad 100644 --- a/examples/sld/example.json +++ b/examples/sld/example.json @@ -1,17 +1,25 @@ { "title": "Styling WMS raster layers", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "about": { "text": "Rendering tiles from a WMS server by customizing the style." }, "disabled": true, - "disable_tests": [{ - "description": "data is loaded from the WMS source", - "idle": ["$('#map.geojs-map').data('data-geojs-map').onIdle"], - "tests": [ - "Object.keys($('#map.geojs-map').data('data-geojs-map').layers()[1]._activeTiles).length === 15", - "$('#map.geojs-map').data('data-geojs-map').layers()[1]._activeTiles['9_194_148']._image.naturalWidth === 256" - ] - }] + "disable_tests": [ + { + "description": "data is loaded from the WMS source", + "idle": [ + "$('#map.geojs-map').data('data-geojs-map').onIdle" + ], + "tests": [ + "Object.keys($('#map.geojs-map').data('data-geojs-map').layers()[1]._activeTiles).length === 15", + "$('#map.geojs-map').data('data-geojs-map').layers()[1]._activeTiles['9_194_148']._image.naturalWidth === 256" + ] + } + ] } diff --git a/examples/tiles/example.json b/examples/tiles/example.json index 81d1588c8a..fa38453b45 100644 --- a/examples/tiles/example.json +++ b/examples/tiles/example.json @@ -1,7 +1,11 @@ { "title": "Tile layer with controllable options", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example provides controls for changing many options on tile layers. The code and query parameters allow even more options to be adjusted." } diff --git a/examples/transitions/example.json b/examples/transitions/example.json index 8641ad20cc..045e503ecf 100644 --- a/examples/transitions/example.json +++ b/examples/transitions/example.json @@ -1,7 +1,11 @@ { "title": "Using animated transitions", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "about": { "text": "Using animations to transition between points on a map." } diff --git a/examples/twomaps/example.json b/examples/twomaps/example.json index bad76d5124..c1a8d839e2 100644 --- a/examples/twomaps/example.json +++ b/examples/twomaps/example.json @@ -1,7 +1,11 @@ { "title": "One map set inside another.", - "exampleCss": ["main.css"], - "exampleJs": ["main.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js" + ], "about": { "text": "This example show how two maps can be made to move together and show similar, but different data." } diff --git a/examples/ui/example.json b/examples/ui/example.json index 99617fba61..ffced67a3e 100644 --- a/examples/ui/example.json +++ b/examples/ui/example.json @@ -1,6 +1,8 @@ { "title": "User interface widgets", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "A basic map with user interface widgets" }, diff --git a/examples/vectors/example.json b/examples/vectors/example.json index 5a1877aeb7..2c690a52e7 100644 --- a/examples/vectors/example.json +++ b/examples/vectors/example.json @@ -1,6 +1,8 @@ { "title": "Vectors", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "Basic map rendering different sets of vectors with different marker styles." }, diff --git a/examples/vtkjs/example.json b/examples/vtkjs/example.json index b137b32d9f..8a03186cf5 100644 --- a/examples/vtkjs/example.json +++ b/examples/vtkjs/example.json @@ -1,6 +1,8 @@ { "title": "Use VTK.js along with GeoJS", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "Show national capitals as points using the vtkjs renderer." }, diff --git a/examples/widgets/example.json b/examples/widgets/example.json index a122339d2d..289a5e0d91 100644 --- a/examples/widgets/example.json +++ b/examples/widgets/example.json @@ -1,7 +1,12 @@ { "title": "Map Widgets", - "exampleCss": ["main.css"], - "exampleJs": ["main.js", "chart.js"], + "exampleCss": [ + "main.css" + ], + "exampleJs": [ + "main.js", + "chart.js" + ], "about": { "text": "This example shows how the widgets API can be used to place elements on top of the map." }, diff --git a/examples/wms/example.json b/examples/wms/example.json index ba1f943aab..0533084d33 100644 --- a/examples/wms/example.json +++ b/examples/wms/example.json @@ -1,6 +1,8 @@ { "title": "Rendering tiles from a WMS server", - "exampleJs": ["main.js"], + "exampleJs": [ + "main.js" + ], "about": { "text": "Rendering tiles from a WMS server by customizing the tile URL of an OSM layer." } diff --git a/jsdoc.conf.json b/jsdoc.conf.json index 635aad2b30..d317db9b56 100644 --- a/jsdoc.conf.json +++ b/jsdoc.conf.json @@ -3,10 +3,10 @@ "template": "jsdoc/template" }, "plugins": [ + "jsdoc/plugins/autoprivate", + "jsdoc/plugins/dot_in_name", "jsdoc/plugins/events", "jsdoc/plugins/typedef_augments", - "jsdoc/plugins/dot_in_name", - "node_modules/jsdoc-autoprivate/autoprivate.js", "plugins/markdown" ], "templates": { @@ -41,9 +41,9 @@ "menu": { "GitHub Repository": { "href": "https://github.com/OpenGeoscience/geojs", - "target":"_blank", - "class":"menu-item", - "id":"website_link" + "target": "_blank", + "class": "menu-item", + "id": "website_link" } }, "openGraph": { diff --git a/jsdoc/plugins/autoprivate.js b/jsdoc/plugins/autoprivate.js new file mode 100644 index 0000000000..38b862ebda --- /dev/null +++ b/jsdoc/plugins/autoprivate.js @@ -0,0 +1,13 @@ +/* jshint node: true */ + +'use strict'; + +exports.handlers = { + newDoclet: function (e) { + if (e.doclet && e.doclet.name) { + if (e.doclet.name[0] === '_') { + e.doclet.access = 'private'; + } + } + } +}; diff --git a/package-lock.json b/package-lock.json index 73cfc1dde5..85e49da435 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,13 +56,12 @@ "jasmine-core": "^6.1.0", "js-yaml": "^4.1.0", "jsdoc": "^4.0.0", - "jsdoc-autoprivate": "0.0.1", "jsonlint-mod": "^1.7.6", "jstransformer-markdown-it": "^3.0.0", "looks-same": "^10.0.1", "neostandard": "^0.13.0", "nib": "^1.1.2", - "nise": "<6.1.2 || >=6.1.3", + "nise": "<6.1.2 || >=6.1.4", "npm-run-all": "^4.1.5", "pako": "^2.0.4", "pug": "^3.0.2", @@ -2562,9 +2561,9 @@ } }, "node_modules/@sinonjs/fake-timers": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-15.1.1.tgz", - "integrity": "sha512-cO5W33JgAPbOh07tvZjUOJ7oWhtaqGHiZw+11DPbyqh2kHTBc3eF/CjJDeQ4205RLQsX6rxCuYOroFQwl7JDRw==", + "version": "13.0.5", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", + "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -2596,7 +2595,7 @@ "version": "0.7.3", "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", - "deprecated": "Deprecated: no longer maintained, as we are not depending on it", + "deprecated": "Deprecated: no longer maintained and no longer used by Sinon packages. See\n https://github.com/sinonjs/nise/issues/243 for replacement details.", "dev": true, "license": "(Unlicense OR Apache-2.0)" }, @@ -6926,9 +6925,9 @@ "license": "MIT" }, "node_modules/fs-extra": { - "version": "11.3.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.3.tgz", - "integrity": "sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==", + "version": "11.3.4", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz", + "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==", "dev": true, "license": "MIT", "dependencies": { @@ -8436,13 +8435,6 @@ "node": ">=12.0.0" } }, - "node_modules/jsdoc-autoprivate": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/jsdoc-autoprivate/-/jsdoc-autoprivate-0.0.1.tgz", - "integrity": "sha512-k0f7lSwrxk3ZZ+OvvFqo5M4yhUZ4TRkHAqpmZ02iMcjfx2FBl/VVoCzXDZXgYO1ryJvTZBzKt28Ct2W2GOvVfw==", - "dev": true, - "license": "MIT" - }, "node_modules/jsdoc-type-pratt-parser": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-7.1.1.tgz", @@ -9419,16 +9411,6 @@ "path-to-regexp": "^8.1.0" } }, - "node_modules/nise/node_modules/@sinonjs/fake-timers": { - "version": "13.0.5", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", - "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@sinonjs/commons": "^3.0.1" - } - }, "node_modules/node-abi": { "version": "3.87.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.87.0.tgz", @@ -11526,16 +11508,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/serialize-javascript": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.4.tgz", - "integrity": "sha512-DuGdB+Po43Q5Jxwpzt1lhyFSYKryqoNjQSA9M92tyw0lyHIOur+XCalOUe0KTJpyqzT8+fQ5A0Jf7vCx/NKmIg==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=20.0.0" - } - }, "node_modules/serve-index": { "version": "1.9.2", "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.2.tgz", @@ -11996,6 +11968,16 @@ "url": "https://opencollective.com/sinon" } }, + "node_modules/sinon/node_modules/@sinonjs/fake-timers": { + "version": "15.1.1", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-15.1.1.tgz", + "integrity": "sha512-cO5W33JgAPbOh07tvZjUOJ7oWhtaqGHiZw+11DPbyqh2kHTBc3eF/CjJDeQ4205RLQsX6rxCuYOroFQwl7JDRw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^3.0.1" + } + }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -12918,16 +12900,15 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.16", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.16.tgz", - "integrity": "sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q==", + "version": "5.3.17", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.17.tgz", + "integrity": "sha512-YR7PtUp6GMU91BgSJmlaX/rS2lGDbAF7D+Wtq7hRO+MiljNmodYvqslzCFiYVAgW+Qoaaia/QUIP4lGXufjdZw==", "dev": true, "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.25", "jest-worker": "^27.4.5", "schema-utils": "^4.3.0", - "serialize-javascript": "^6.0.2", "terser": "^5.31.1" }, "engines": { @@ -13664,9 +13645,9 @@ } }, "node_modules/webpack": { - "version": "5.105.3", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.3.tgz", - "integrity": "sha512-LLBBA4oLmT7sZdHiYE/PeVuifOxYyE2uL/V+9VQP7YSYdJU7bSf7H8bZRRxW8kEPMkmVjnrXmoR3oejIdX0xbg==", + "version": "5.105.4", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.4.tgz", + "integrity": "sha512-jTywjboN9aHxFlToqb0K0Zs9SbBoW4zRUlGzI2tYNxVYcEi/IPpn+Xi4ye5jTLvX2YeLuic/IvxNot+Q1jMoOw==", "dev": true, "license": "MIT", "dependencies": { @@ -13680,7 +13661,7 @@ "acorn-import-phases": "^1.0.3", "browserslist": "^4.28.1", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.19.0", + "enhanced-resolve": "^5.20.0", "es-module-lexer": "^2.0.0", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -13692,7 +13673,7 @@ "neo-async": "^2.6.2", "schema-utils": "^4.3.3", "tapable": "^2.3.0", - "terser-webpack-plugin": "^5.3.16", + "terser-webpack-plugin": "^5.3.17", "watchpack": "^2.5.1", "webpack-sources": "^3.3.4" }, diff --git a/package.json b/package.json index d4411285e7..e672990226 100644 --- a/package.json +++ b/package.json @@ -65,13 +65,12 @@ "jasmine-core": "^6.1.0", "js-yaml": "^4.1.0", "jsdoc": "^4.0.0", - "jsdoc-autoprivate": "0.0.1", "jsonlint-mod": "^1.7.6", "jstransformer-markdown-it": "^3.0.0", "looks-same": "^10.0.1", "neostandard": "^0.13.0", "nib": "^1.1.2", - "nise": "<6.1.2 || >=6.1.3", + "nise": "<6.1.2 || >=6.1.4", "npm-run-all": "^4.1.5", "pako": "^2.0.4", "pug": "^3.0.2", @@ -97,7 +96,7 @@ }, "overrides": { "jstransformer-markdown-it": { - "markdown-it": "^14.0.0" + "markdown-it": "^14.0.0" }, "terser-webpack-plugin": { "serialize-javascript": "^7.0.3" diff --git a/tests/data/sample.json b/tests/data/sample.json index f7d7bf82e9..9763781536 100644 --- a/tests/data/sample.json +++ b/tests/data/sample.json @@ -1,204 +1,204 @@ { - "type": "FeatureCollection", - "features": [ - { - "type": "Feature", - "geometry": { - "type": "Point", - "coordinates": [ - -80.87088507656375, - 35.21515162500578 - ] - }, - "properties": { - "name": "ABBOTT NEIGHBORHOOD PARK", - "address": "1300 SPRUCE ST" - } - }, - { - "type": "Feature", - "geometry": { - "type": "Point", - "coordinates": [ - -80.83775386582222, - 35.24980190252168 - ] - }, - "properties": { - "name": "DOUBLE OAKS CENTER", - "address": "1326 WOODWARD AV" - } - }, - { - "type": "Feature", - "geometry": { - "type": "Point", - "coordinates": [ - -80.83827000459532, - 35.25674709224663 - ] - }, - "properties": { - "name": "DOUBLE OAKS NEIGHBORHOOD PARK", - "address": "2605 DOUBLE OAKS RD" - } - }, - { - "type": "Feature", - "geometry": { - "type": "Point", - "coordinates": [ - -80.83697759172735, - 35.25751734669229 - ] - }, - "properties": { - "name": "DOUBLE OAKS POOL", - "address": "1200 NEWLAND RD" - } - }, - { - "type": "Feature", - "geometry": { - "type": "Point", - "coordinates": [ - -80.81647652154736, - 35.40148708491418 - ] - }, - "properties": { - "name": "DAVID B. WAYMER FLYING REGIONAL PARK", - "address": "15401 HOLBROOKS RD" - } - }, - { - "type": "Feature", - "geometry": { - "type": "Point", - "coordinates": [ - -80.83556459443902, - 35.39917224760999 - ] - }, - "properties": { - "name": "DAVID B. WAYMER COMMUNITY PARK", - "address": "302 HOLBROOKS RD" - } - }, - { - "type": "Feature", - "geometry": { - "type": "LineString", - "coordinates": [ - [ - -101.744384765625, - 39.32155002466662 - ], - [ - -101.5521240234375, - 39.330048552942415 - ], - [ - -101.40380859375, - 39.330048552942415 - ], - [ - -101.33239746093749, - 39.364032338047984 - ], - [ - -101.041259765625, - 39.36827914916011 - ], - [ - -100.975341796875, - 39.30454987014581 - ], - [ - -100.9149169921875, - 39.24501680713314 - ], - [ - -100.843505859375, - 39.16414104768742 - ], - [ - -100.8050537109375, - 39.104488809440475 - ], - [ - -100.491943359375, - 39.10022600175347 - ], - [ - -100.43701171875, - 39.095962936305476 - ], - [ - -100.338134765625, - 39.095962936305476 - ], - [ - -100.1953125, - 39.027718840211605 - ], - [ - -100.008544921875, - 39.01064750994083 - ], - [ - -99.86572265625, - 39.00211029922512 - ], - [ - -99.6844482421875, - 38.97222194853654 - ], - [ - -99.51416015625, - 38.929502416386605 - ], - [ - -99.38232421875, - 38.92095542046727 - ], - [ - -99.3218994140625, - 38.89530825492018 - ], - [ - -99.1131591796875, - 38.86965182408357 - ], - [ - -99.0802001953125, - 38.85682013474361 - ], - [ - -98.82202148437499, - 38.85682013474361 - ], - [ - -98.44848632812499, - 38.84826438869913 - ], - [ - -98.20678710937499, - 38.84826438869913 - ], - [ - -98.02001953125, - 38.8782049970615 - ], - [ - -97.635498046875, - 38.87392853923629 - ] - ] - }, - "properties": { - "name": "Plaza Road" - } - } - ] + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + -80.87088507656375, + 35.21515162500578 + ] + }, + "properties": { + "name": "ABBOTT NEIGHBORHOOD PARK", + "address": "1300 SPRUCE ST" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + -80.83775386582222, + 35.24980190252168 + ] + }, + "properties": { + "name": "DOUBLE OAKS CENTER", + "address": "1326 WOODWARD AV" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + -80.83827000459532, + 35.25674709224663 + ] + }, + "properties": { + "name": "DOUBLE OAKS NEIGHBORHOOD PARK", + "address": "2605 DOUBLE OAKS RD" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + -80.83697759172735, + 35.25751734669229 + ] + }, + "properties": { + "name": "DOUBLE OAKS POOL", + "address": "1200 NEWLAND RD" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + -80.81647652154736, + 35.40148708491418 + ] + }, + "properties": { + "name": "DAVID B. WAYMER FLYING REGIONAL PARK", + "address": "15401 HOLBROOKS RD" + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + -80.83556459443902, + 35.39917224760999 + ] + }, + "properties": { + "name": "DAVID B. WAYMER COMMUNITY PARK", + "address": "302 HOLBROOKS RD" + } + }, + { + "type": "Feature", + "geometry": { + "type": "LineString", + "coordinates": [ + [ + -101.744384765625, + 39.32155002466662 + ], + [ + -101.5521240234375, + 39.330048552942415 + ], + [ + -101.40380859375, + 39.330048552942415 + ], + [ + -101.33239746093749, + 39.364032338047984 + ], + [ + -101.041259765625, + 39.36827914916011 + ], + [ + -100.975341796875, + 39.30454987014581 + ], + [ + -100.9149169921875, + 39.24501680713314 + ], + [ + -100.843505859375, + 39.16414104768742 + ], + [ + -100.8050537109375, + 39.104488809440475 + ], + [ + -100.491943359375, + 39.10022600175347 + ], + [ + -100.43701171875, + 39.095962936305476 + ], + [ + -100.338134765625, + 39.095962936305476 + ], + [ + -100.1953125, + 39.027718840211605 + ], + [ + -100.008544921875, + 39.01064750994083 + ], + [ + -99.86572265625, + 39.00211029922512 + ], + [ + -99.6844482421875, + 38.97222194853654 + ], + [ + -99.51416015625, + 38.929502416386605 + ], + [ + -99.38232421875, + 38.92095542046727 + ], + [ + -99.3218994140625, + 38.89530825492018 + ], + [ + -99.1131591796875, + 38.86965182408357 + ], + [ + -99.0802001953125, + 38.85682013474361 + ], + [ + -98.82202148437499, + 38.85682013474361 + ], + [ + -98.44848632812499, + 38.84826438869913 + ], + [ + -98.20678710937499, + 38.84826438869913 + ], + [ + -98.02001953125, + 38.8782049970615 + ], + [ + -97.635498046875, + 38.87392853923629 + ] + ] + }, + "properties": { + "name": "Plaza Road" + } + } + ] } diff --git a/tutorials/editor/tutorial.json b/tutorials/editor/tutorial.json index d4b39060c2..6d1d45a0e1 100644 --- a/tutorials/editor/tutorial.json +++ b/tutorials/editor/tutorial.json @@ -3,7 +3,9 @@ "hideNavbar": true, "level": 10, "order": 0, - "tutorialJs": ["editor.js"], + "tutorialJs": [ + "editor.js" + ], "about": { "text": "Edit and save work in URL." } diff --git a/tutorials/editor3/tutorial.json b/tutorials/editor3/tutorial.json index 3729b3bffe..f680c6a995 100644 --- a/tutorials/editor3/tutorial.json +++ b/tutorials/editor3/tutorial.json @@ -3,7 +3,9 @@ "hideNavbar": true, "level": 10, "order": 1, - "tutorialJs": ["editor.js"], + "tutorialJs": [ + "editor.js" + ], "about": { "text": "Edit and save work in URL. Edit the HTML to try different versions of GeoJS." } diff --git a/website/source/favicon/manifest.json b/website/source/favicon/manifest.json index 758f8d2a60..3b557aab8c 100644 --- a/website/source/favicon/manifest.json +++ b/website/source/favicon/manifest.json @@ -1,41 +1,41 @@ { - "name": "App", - "icons": [ - { - "src": "\/android-icon-36x36.png", - "sizes": "36x36", - "type": "image\/png", - "density": "0.75" - }, - { - "src": "\/android-icon-48x48.png", - "sizes": "48x48", - "type": "image\/png", - "density": "1.0" - }, - { - "src": "\/android-icon-72x72.png", - "sizes": "72x72", - "type": "image\/png", - "density": "1.5" - }, - { - "src": "\/android-icon-96x96.png", - "sizes": "96x96", - "type": "image\/png", - "density": "2.0" - }, - { - "src": "\/android-icon-144x144.png", - "sizes": "144x144", - "type": "image\/png", - "density": "3.0" - }, - { - "src": "\/android-icon-192x192.png", - "sizes": "192x192", - "type": "image\/png", - "density": "4.0" - } - ] + "name": "App", + "icons": [ + { + "src": "/android-icon-36x36.png", + "sizes": "36x36", + "type": "image/png", + "density": "0.75" + }, + { + "src": "/android-icon-48x48.png", + "sizes": "48x48", + "type": "image/png", + "density": "1.0" + }, + { + "src": "/android-icon-72x72.png", + "sizes": "72x72", + "type": "image/png", + "density": "1.5" + }, + { + "src": "/android-icon-96x96.png", + "sizes": "96x96", + "type": "image/png", + "density": "2.0" + }, + { + "src": "/android-icon-144x144.png", + "sizes": "144x144", + "type": "image/png", + "density": "3.0" + }, + { + "src": "/android-icon-192x192.png", + "sizes": "192x192", + "type": "image/png", + "density": "4.0" + } + ] } diff --git a/website/themes/agency/_config.yml b/website/themes/agency/_config.yml old mode 100755 new mode 100644 diff --git a/website/themes/agency/layout/example.ejs b/website/themes/agency/layout/example.ejs old mode 100755 new mode 100644 diff --git a/website/themes/agency/layout/examples.ejs b/website/themes/agency/layout/examples.ejs old mode 100755 new mode 100644 diff --git a/website/themes/agency/layout/index.ejs b/website/themes/agency/layout/index.ejs old mode 100755 new mode 100644 diff --git a/website/themes/agency/layout/layout.ejs b/website/themes/agency/layout/layout.ejs old mode 100755 new mode 100644 diff --git a/website/themes/agency/layout/page.ejs b/website/themes/agency/layout/page.ejs old mode 100755 new mode 100644 diff --git a/website/themes/agency/layout/tutorial.ejs b/website/themes/agency/layout/tutorial.ejs old mode 100755 new mode 100644 diff --git a/website/themes/agency/layout/tutorials.ejs b/website/themes/agency/layout/tutorials.ejs old mode 100755 new mode 100644 diff --git a/website/themes/agency/scripts/helper.js b/website/themes/agency/scripts/helper.js old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/css/agency.css b/website/themes/agency/source/css/agency.css old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/css/download.scss b/website/themes/agency/source/css/download.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/css/example.scss b/website/themes/agency/source/css/example.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/css/highlight.css b/website/themes/agency/source/css/highlight.css old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/css/logo-zoom.scss b/website/themes/agency/source/css/logo-zoom.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/css/main.scss b/website/themes/agency/source/css/main.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/css/syntax.css b/website/themes/agency/source/css/syntax.css old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/css/tutorial.scss b/website/themes/agency/source/css/tutorial.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/images/GEO_Logo_Full.svg b/website/themes/agency/source/images/GEO_Logo_Full.svg old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/images/GEO_Logo_Mark.svg b/website/themes/agency/source/images/GEO_Logo_Mark.svg old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/js/agency.js b/website/themes/agency/source/js/agency.js old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/js/example.js b/website/themes/agency/source/js/example.js old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/js/logo-zoom.js b/website/themes/agency/source/js/logo-zoom.js old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/bootstrap/css/bootstrap.css b/website/themes/agency/source/vendor/bootstrap/css/bootstrap.css old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/bootstrap/css/bootstrap.min.css b/website/themes/agency/source/vendor/bootstrap/css/bootstrap.min.css old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg b/website/themes/agency/source/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/bootstrap/js/bootstrap.js b/website/themes/agency/source/vendor/bootstrap/js/bootstrap.js old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/bootstrap/js/bootstrap.min.js b/website/themes/agency/source/vendor/bootstrap/js/bootstrap.min.js old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/css/font-awesome.css b/website/themes/agency/source/vendor/font-awesome/css/font-awesome.css old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/css/font-awesome.min.css b/website/themes/agency/source/vendor/font-awesome/css/font-awesome.min.css old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/fonts/fontawesome-webfont.svg b/website/themes/agency/source/vendor/font-awesome/fonts/fontawesome-webfont.svg old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/less/animated.less b/website/themes/agency/source/vendor/font-awesome/less/animated.less old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/less/bordered-pulled.less b/website/themes/agency/source/vendor/font-awesome/less/bordered-pulled.less old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/less/core.less b/website/themes/agency/source/vendor/font-awesome/less/core.less old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/less/fixed-width.less b/website/themes/agency/source/vendor/font-awesome/less/fixed-width.less old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/less/font-awesome.less b/website/themes/agency/source/vendor/font-awesome/less/font-awesome.less old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/less/icons.less b/website/themes/agency/source/vendor/font-awesome/less/icons.less old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/less/larger.less b/website/themes/agency/source/vendor/font-awesome/less/larger.less old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/less/list.less b/website/themes/agency/source/vendor/font-awesome/less/list.less old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/less/mixins.less b/website/themes/agency/source/vendor/font-awesome/less/mixins.less old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/less/path.less b/website/themes/agency/source/vendor/font-awesome/less/path.less old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/less/rotated-flipped.less b/website/themes/agency/source/vendor/font-awesome/less/rotated-flipped.less old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/less/screen-reader.less b/website/themes/agency/source/vendor/font-awesome/less/screen-reader.less old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/less/stacked.less b/website/themes/agency/source/vendor/font-awesome/less/stacked.less old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/less/variables.less b/website/themes/agency/source/vendor/font-awesome/less/variables.less old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/scss/_animated.scss b/website/themes/agency/source/vendor/font-awesome/scss/_animated.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/scss/_bordered-pulled.scss b/website/themes/agency/source/vendor/font-awesome/scss/_bordered-pulled.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/scss/_core.scss b/website/themes/agency/source/vendor/font-awesome/scss/_core.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/scss/_fixed-width.scss b/website/themes/agency/source/vendor/font-awesome/scss/_fixed-width.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/scss/_icons.scss b/website/themes/agency/source/vendor/font-awesome/scss/_icons.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/scss/_larger.scss b/website/themes/agency/source/vendor/font-awesome/scss/_larger.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/scss/_list.scss b/website/themes/agency/source/vendor/font-awesome/scss/_list.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/scss/_mixins.scss b/website/themes/agency/source/vendor/font-awesome/scss/_mixins.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/scss/_path.scss b/website/themes/agency/source/vendor/font-awesome/scss/_path.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/scss/_rotated-flipped.scss b/website/themes/agency/source/vendor/font-awesome/scss/_rotated-flipped.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/scss/_screen-reader.scss b/website/themes/agency/source/vendor/font-awesome/scss/_screen-reader.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/scss/_stacked.scss b/website/themes/agency/source/vendor/font-awesome/scss/_stacked.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/scss/_variables.scss b/website/themes/agency/source/vendor/font-awesome/scss/_variables.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/font-awesome/scss/font-awesome.scss b/website/themes/agency/source/vendor/font-awesome/scss/font-awesome.scss old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/jquery/jquery.js b/website/themes/agency/source/vendor/jquery/jquery.js old mode 100755 new mode 100644 diff --git a/website/themes/agency/source/vendor/jquery/jquery.min.js b/website/themes/agency/source/vendor/jquery/jquery.min.js old mode 100755 new mode 100644