diff --git a/.gitignore b/.gitignore index a429cf2..68107d3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ dist *.shp layers/dot-cams/*/data/states.js layers/survey-markers/states.js -layers/tjx/data/chains.js diff --git a/layers/index.js b/layers/index.js index 411b74e..025c744 100644 --- a/layers/index.js +++ b/layers/index.js @@ -18,7 +18,6 @@ import state_land from './state-land/index.js'; import trips from './trips/index.js'; import dot_cams from './dot-cams/index.js'; import survey_markers from './survey-markers/index.js'; -import tjx from './tjx/index.js'; const layerCategories = [ { // Base maps @@ -100,7 +99,6 @@ const layerCategories = [ state_land, cellular, light_pollution, - tjx, ]; export default layerCategories; diff --git a/layers/tjx/get_data.py b/layers/tjx/get_data.py deleted file mode 100755 index 0f95abd..0000000 --- a/layers/tjx/get_data.py +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/python - -# Turns out alltheplaces has done all the hard work here; we can use their -# (CC0-licensed) data rather than trying to replicate the scraper ourselves. -# -# Unfortunately, many of the stores' individual location searches, including the -# parent TJX's list at https://www.tjx.com/stores, don't provide a list of -# stores, and only a search result. Some do, e.g. Sierra, with a chunk of -# javascript containing a list of JS objects, but this isn't consistent across -# stores, and I'm too lazy to reimplement something for every store. So, instead -# we take advantage of the hard work of those who have gone before us! - -import requests -import json - -data = requests.get('https://alltheplaces-data.openaddresses.io/runs/2024-04-20-13-31-46/output/tjx.geojson') - -chains = {} - -for store in data.json()['features']: - # store = { - # "type": "Feature", - # "id": "iaLJnlhrRR8daHXO0SGtTHQ2aYM=", - # "properties": { - # "ref": "93743", - # "@spider": "tjx", - # "shop": "department_store", - # "addr:full": "655 Sydney Ave", - # "addr:city": "Windsor", - # "addr:state": "ON", - # "addr:postcode": "N8X 5C4", - # "addr:country": "CA", - # "name": "Windsor", - # "phone": "+1 519-250-0494", - # "opening_hours": "Mo-Fr 09:30-21:00; Sa 09:00-21:00; Su 10:00-18:00", - # "brand": "Marshalls", - # "brand:wikidata": "Q15903261", - # "nsi_id": "marshalls-53f9e5" - # }, - # "geometry": { - # "type": "Point", - # "coordinates": [ - # -82.9981994628906, - # 42.2717170715332 - # ] - # } - # }, - if not store['properties']['brand'] in chains: - chains[store['properties']['brand']] = [] - chains[store['properties']['brand']].append({ - "type": "Feature", - "geometry": store['geometry'], - "properties": { - "name": store['properties']['name'], - "addr": store['properties']['addr:full'], - "city": store['properties']['addr:city'], - "state": store['properties']['addr:state'], - "postcode": store['properties']['addr:postcode'], - "country": store['properties']['addr:country'], - }, - }) - -safe_name = lambda s: ''.join([c.lower() for c in s if c.isalpha()]) - -for chain, features in chains.items(): - geojson = { - "type": "FeatureCollection", - "features": features, - } - - with open(f"data/{safe_name(chain)}.geojson", "w") as f: - f.write(json.dumps(geojson)) - - print(f"{len(features)} {chain} locations found") - -with open('data/chains.js', 'w') as f: - for chain in chains: - f.write(f"import {safe_name(chain)} from './{safe_name(chain)}.geojson?url';\n") - f.write('\nexport default {\n') - for chain in chains: - f.write(f" \"{chain}\": {safe_name(chain)},\n") - f.write("};\n") diff --git a/layers/tjx/index.js b/layers/tjx/index.js deleted file mode 100644 index ee122ab..0000000 --- a/layers/tjx/index.js +++ /dev/null @@ -1,39 +0,0 @@ -import VectorLayer from 'ol/layer/Vector'; -import {Vector as VectorSource} from 'ol/source.js'; -import GeoJSON from 'ol/format/GeoJSON.js'; - -import {Style} from 'ol/style.js'; -import Icon from 'ol/style/Icon.js'; - -import pin from './pin.svg?url'; -import data from './data/chains.js'; - -const chains = { - name: "TJX brands", - details: `https://en.wikipedia.org/wiki/TJX_Companies`, - layers: [], -}; - -for (let [chain, url] of Object.entries(data)) { - const vectorLayer = new VectorLayer({ - source: new VectorSource({ - url: url, - format: new GeoJSON, - }), - style: new Style({ - image: new Icon({ - anchor: [0.5, 1], - src: pin, - }), - }), - }); - - chains.layers.push({ - name: chain, - layer: vectorLayer, - }); -} - -chains.layers.sort((a, b) => a.name > b.name ? 1 : -1); // Names are always unique - -export default chains; diff --git a/layers/tjx/pin.svg b/layers/tjx/pin.svg deleted file mode 100644 index 36dca6a..0000000 --- a/layers/tjx/pin.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/package-lock.json b/package-lock.json index 78950be..90fd008 100644 --- a/package-lock.json +++ b/package-lock.json @@ -370,24 +370,21 @@ } }, "node_modules/@petamoriken/float16": { - "version": "3.8.6", - "resolved": "https://registry.npmjs.org/@petamoriken/float16/-/float16-3.8.6.tgz", - "integrity": "sha512-GNJhABTtcmt9al/nqdJPycwFD46ww2+q2zwZzTjY0dFFwUAFRw9zszvEr9osyJRd9krRGy6hUDopWUg9fX7VVw==" + "version": "3.8.4", + "resolved": "https://registry.npmjs.org/@petamoriken/float16/-/float16-3.8.4.tgz", + "integrity": "sha512-kB+NJ5Br56ZhElKsf0pM7/PQfrDdDVMRz8f0JM6eVOGE+L89z9hwcst9QvWBBnazzuqGTGtPsJNZoQ1JdNiGSQ==" }, "node_modules/color-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.0.tgz", - "integrity": "sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==", - "engines": { - "node": ">=12.20" - } + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/color-parse": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/color-parse/-/color-parse-2.0.2.tgz", - "integrity": "sha512-eCtOz5w5ttWIUcaKLiktF+DxZO1R9KLNY/xhbV6CkhM7sR3GhVghmt6X6yOnzeaM24po+Z9/S1apbXMwA3Iepw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/color-parse/-/color-parse-2.0.0.tgz", + "integrity": "sha512-g2Z+QnWsdHLppAbrpcFWo629kLOnOPtpxYV69GCqm92gqSgyXbzlfyN3MXs0412fPBkFmiuS+rXposgBgBa6Kg==", "dependencies": { - "color-name": "^2.0.0" + "color-name": "^1.0.0" } }, "node_modules/color-rgba": { @@ -461,9 +458,9 @@ } }, "node_modules/geotiff": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/geotiff/-/geotiff-2.1.3.tgz", - "integrity": "sha512-PT6uoF5a1+kbC3tHmZSUsLHBp2QJlHasxxxxPW47QIY1VBKpFB+FcDvX+MxER6UzgLQZ0xDzJ9s48B9JbOCTqA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/geotiff/-/geotiff-2.1.2.tgz", + "integrity": "sha512-xw7Cd6HXukUdfFSe5QCSjdhebTCGkk87x7fKURqQPFKT+TijCCwKvoksL7T3+B6mJWZSB7muTJlwVIQsLtbkMA==", "dependencies": { "@petamoriken/float16": "^3.4.7", "lerc": "^3.0.0", @@ -479,9 +476,9 @@ } }, "node_modules/hls.js": { - "version": "1.5.8", - "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.5.8.tgz", - "integrity": "sha512-hJYMPfLhWO7/7+n4f9pn6bOheCGx0WgvVz7k3ouq3Pp1bja48NN+HeCQu3XCGYzqWQF/wo7Sk6dJAyWVJD8ECA==" + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.5.3.tgz", + "integrity": "sha512-gonnYpZ5bxuVdwpcbzfylUlNZ8917LjACUjpWXiaeo8zPAIDfPcMZjEQPy6CeeRSJbcg1P+aVqwxrXr2J+SeUg==" }, "node_modules/ieee754": { "version": "1.2.1", @@ -531,9 +528,9 @@ } }, "node_modules/ol": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/ol/-/ol-9.1.0.tgz", - "integrity": "sha512-nDrkJ2tzZNpo/wzN/PpHV5zdxbnXZaFktoMaD2cFLEc6gCwlgLY21Yd8wnt/4FjaVYwLBnbN9USXSwIBGcyksQ==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/ol/-/ol-8.2.0.tgz", + "integrity": "sha512-/m1ddd7Jsp4Kbg+l7+ozR5aKHAZNQOBAoNZ5pM9Jvh4Etkf0WGkXr9qXd7PnhmwiC1Hnc2Toz9XjCzBBvexfXw==", "dependencies": { "color-rgba": "^3.0.0", "color-space": "^2.0.1", @@ -548,9 +545,9 @@ } }, "node_modules/ol-contextmenu": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/ol-contextmenu/-/ol-contextmenu-5.4.0.tgz", - "integrity": "sha512-F2cIwCToMAYsddnrcRvCnWAH4bp9n9LNHrDTqU3mDJMiNUw1RB4Ovz5b2FwxasLpymtkzV8ME39u+mP3IvpT6g==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ol-contextmenu/-/ol-contextmenu-5.3.0.tgz", + "integrity": "sha512-AO9rGKaQpLAzqpEva7mukhkWrGkL/o1s8tXPsYuYBGMoiTBbXffgTikXjTmq1m7l3gDwXWWWi6R2ROda5lgXNw==", "dependencies": { "tiny-emitter": "^2.1.0" }, @@ -559,7 +556,7 @@ "npm": ">=8" }, "peerDependencies": { - "ol": "> 7.x <= 9.x" + "ol": "> 7.x <= 8.x" } }, "node_modules/pako": { @@ -591,9 +588,9 @@ "dev": true }, "node_modules/postcss": { - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "version": "8.4.33", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz", + "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==", "dev": true, "funding": [ { @@ -612,7 +609,7 @@ "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.0.0", - "source-map-js": "^1.2.0" + "source-map-js": "^1.0.2" }, "engines": { "node": "^10 || ^12 || >=14" @@ -681,9 +678,9 @@ } }, "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "dev": true, "engines": { "node": ">=0.10.0" @@ -695,9 +692,9 @@ "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" }, "node_modules/vite": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", - "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", + "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", "dev": true, "dependencies": { "esbuild": "^0.18.10", @@ -760,9 +757,9 @@ "integrity": "sha512-ZnV3yH8/k58ZPACOXeiHaMuXIiaTk1t0hSUVisbO0t4RjA5wPpUytcxeyiN2h+LZRrmuHIh/1UlrR9e7DHDvTw==" }, "node_modules/xml-utils": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/xml-utils/-/xml-utils-1.8.0.tgz", - "integrity": "sha512-1TY5yLw8DApowZAUsWCniNr8HH6Ebt6O7UQvmIwziGKwUNsQx6e+4NkfOvCfnqmYIcPjCeoI6dh1JenPJ9a1hQ==" + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/xml-utils/-/xml-utils-1.7.0.tgz", + "integrity": "sha512-bWB489+RQQclC7A9OW8e5BzbT8Tu//jtAOvkYwewFr+Q9T9KDGvfzC1lp0pYPEQPEoPQLDkmxkepSC/2gIAZGw==" }, "node_modules/zstddec": { "version": "0.1.0",