move javascript code into a src/ directory

osm-americana · Jun 12, 2022 · 40bd8f6 · 40bd8f6
1 parent 5e32b51
commit 40bd8f6
Show file tree

Hide file tree

Showing 35 changed files with 14 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ _Contributors welcome!_
 
 The repository is organized as follows:
 
-- **style/** - The map style. See [Style Contributor's Guide](style/CONTRIBUTE.md)
+- **src/** - The map style. See [CONTRIBUTING.md][].
 - **dev/** - Development tools used for style development. See [Style Developer Tools](dev/README.md)
 - _Coming soon! Other customized parts of the tech stack._
 

diff --git a/doc-img/shield_map_us.svg b/doc-img/shield_map_us.svg
diff --git a/doc-img/shield_map_world.svg b/doc-img/shield_map_world.svg
diff --git a/package.json b/package.json
@@ -8,16 +8,16 @@
     "url": "git+https://github.com/zelonewolf/openstreetmap-americana.git"
   },
   "scripts": {
-    "config": "cp configs/config.maptiler.js config.js",
-    "code_format": "npx prettier --write . && npx svgo -f icons/ --config configs/config.svgo.cjs",
+    "config": "cp src/configs/config.maptiler.js src/config.js",
+    "code_format": "npx prettier --write . && npx svgo -f icons/ --config src/configs/config.svgo.cjs",
     "clean": "rm -rf dist .parcel-cache",
     "presprites": "rm -rf dist/sprites",
     "sprites": "node scripts/sprites.js",
     "status_map": "node scripts/status_map.js",
     "taginfo": "node scripts/taginfo.js",
     "start": "run-s clean sprites serve",
-    "serve": "parcel index.html --open --port 1776",
-    "build:code": "parcel build index.html --public-url ./",
+    "serve": "parcel src/index.html --open --port 1776",
+    "build:code": "parcel build src/index.html --public-url ./",
     "build": "run-s clean sprites build:code taginfo status_map"
   },
   "dependencies": {

diff --git a/scripts/status_map.js b/scripts/status_map.js
@@ -1,7 +1,7 @@
 "use strict";
 
 import * as fs from "fs";
-import * as ShieldDef from "../js/shield_defs.js";
+import * as ShieldDef from "../src/js/shield_defs.js";
 
 function fillPaths(svg, codes) {
   let selectors = new Set(codes.map((code) => `.${code.toLowerCase()}`));
@@ -34,7 +34,7 @@ usSVG = usSVG.replace(
   /<title>.+?<\/title>/,
   "<title>U.S. states with shields supported by OpenStreetMap Americana</title>"
 );
-fs.writeFileSync(`${process.cwd()}/../doc-img/shield_map_us.svg`, usSVG);
+fs.writeFileSync(`${process.cwd()}/doc-img/shield_map_us.svg`, usSVG);
 
 let worldSVG = fs.readFileSync(`${process.cwd()}/scripts/blank_map_world.svg`, {
   encoding: "utf8",
@@ -50,4 +50,4 @@ worldSVG = worldSVG.replace(
   /<title>.+?<\/title>/,
   "<title>Countries with shields supported by OpenStreetMap Americana</title>"
 );
-fs.writeFileSync(`${process.cwd()}/../doc-img/shield_map_world.svg`, worldSVG);
+fs.writeFileSync(`${process.cwd()}/doc-img/shield_map_world.svg`, worldSVG);
diff --git a/scripts/taginfo.js b/scripts/taginfo.js
@@ -1,7 +1,7 @@
 "use strict";
 
 import * as fs from "fs";
-import * as ShieldDef from "../js/shield_defs.js";
+import * as ShieldDef from "../src/js/shield_defs.js";
 
 /**
  * Adds documentation about network=* tags to a project description object, modifying it in place.

diff --git a/americana.js → src/americana.js b/americana.js → src/americana.js
diff --git a/configs/config.aws.js → src/configs/config.aws.js b/configs/config.aws.js → src/configs/config.aws.js
diff --git a/configs/config.localhost.js → src/configs/config.localhost.js b/configs/config.localhost.js → src/configs/config.localhost.js
diff --git a/configs/config.maptiler.js → src/configs/config.maptiler.js b/configs/config.maptiler.js → src/configs/config.maptiler.js
diff --git a/configs/config.svgo.cjs → src/configs/config.svgo.cjs b/configs/config.svgo.cjs → src/configs/config.svgo.cjs
diff --git a/constants/color.js → src/constants/color.js b/constants/color.js → src/constants/color.js
diff --git a/constants/label.js → src/constants/label.js b/constants/label.js → src/constants/label.js
diff --git a/index.html → src/index.html b/index.html → src/index.html
diff --git a/js/screen_gfx.js → src/js/screen_gfx.js b/js/screen_gfx.js → src/js/screen_gfx.js
diff --git a/js/shield.js → src/js/shield.js b/js/shield.js → src/js/shield.js
diff --git a/js/shield_canvas_draw.js → src/js/shield_canvas_draw.js b/js/shield_canvas_draw.js → src/js/shield_canvas_draw.js
diff --git a/js/shield_defs.js → src/js/shield_defs.js b/js/shield_defs.js → src/js/shield_defs.js
diff --git a/js/shield_text.js → src/js/shield_text.js b/js/shield_text.js → src/js/shield_text.js
diff --git a/js/util.js → src/js/util.js b/js/util.js → src/js/util.js
diff --git a/layer/aeroway.js → src/layer/aeroway.js b/layer/aeroway.js → src/layer/aeroway.js
diff --git a/layer/background.js → src/layer/background.js b/layer/background.js → src/layer/background.js
diff --git a/layer/boundary.js → src/layer/boundary.js b/layer/boundary.js → src/layer/boundary.js
diff --git a/layer/building.js → src/layer/building.js b/layer/building.js → src/layer/building.js
diff --git a/layer/ferry.js → src/layer/ferry.js b/layer/ferry.js → src/layer/ferry.js
diff --git a/layer/highway_exit.js → src/layer/highway_exit.js b/layer/highway_exit.js → src/layer/highway_exit.js
diff --git a/layer/highway_shield.js → src/layer/highway_shield.js b/layer/highway_shield.js → src/layer/highway_shield.js
diff --git a/layer/oneway.js → src/layer/oneway.js b/layer/oneway.js → src/layer/oneway.js
diff --git a/layer/park.js → src/layer/park.js b/layer/park.js → src/layer/park.js
diff --git a/layer/place.js → src/layer/place.js b/layer/place.js → src/layer/place.js
diff --git a/layer/road.js → src/layer/road.js b/layer/road.js → src/layer/road.js
diff --git a/layer/road_label.js → src/layer/road_label.js b/layer/road_label.js → src/layer/road_label.js
diff --git a/layer/water.js → src/layer/water.js b/layer/water.js → src/layer/water.js
diff --git a/search.css → src/search.css b/search.css → src/search.css
diff --git a/search.js → src/search.js b/search.js → src/search.js