From fd818835d9badb0d180b24d606cdef2f83525ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Thu, 18 Jul 2024 20:16:25 -0700 Subject: [PATCH 1/3] Updated GitHub Pages URLs --- CONTRIBUTING.md | 2 +- scripts/extract_layer.js | 2 +- scripts/folder_diff.ts | 2 +- scripts/generate_style.js | 2 +- scripts/stats.js | 2 +- scripts/taginfo.js | 4 ++-- shieldlib/README.md | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6c4e9a7e9..3ba38d36e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -363,7 +363,7 @@ This style strives to draw representative highway shields wherever they are tagg For testing out changes across a variety of different shield designs and ref lengths there is a shield test gallery available: - In local development: http://localhost:1776/shieldtest.html -- On the public demo site: https://zelonewolf.github.io/openstreetmap-americana/shieldtest.html +- On the public demo site: https://americanamap.org/shieldtest.html This aims to display a table of all the unique shield designs in the style with some example refs from 1 to 6 characters. The `networks` and `refs` arrays can be modified for testing with a different set of either: diff --git a/scripts/extract_layer.js b/scripts/extract_layer.js index e6eb4cc3b..6e4b3ef08 100644 --- a/scripts/extract_layer.js +++ b/scripts/extract_layer.js @@ -23,7 +23,7 @@ const locales = opts.locales[0].split(","); const style = Style.build( config.OPENMAPTILES_URL, - "https://zelonewolf.github.io/openstreetmap-americana/sprites/sprite", + "https://americanamap.org/sprites/sprite", "https://osm-americana.github.io/fontstack66/{fontstack}/{range}.pbf", locales ); diff --git a/scripts/folder_diff.ts b/scripts/folder_diff.ts index 93263faf8..695213f32 100644 --- a/scripts/folder_diff.ts +++ b/scripts/folder_diff.ts @@ -81,7 +81,7 @@ fs.readdirSync(outputFolder) // Add an entry to the markdown table const loc = getLocationByName(basefile); mdContent += - `| ${basefile}
${loc}
[Current Render](https://zelonewolf.github.io/openstreetmap-americana/#map=${loc})` + + `| ${basefile}
${loc}
[Current Render](https://americanamap.org/#map=${loc})` + `
[This PR](${urlBase}#map=${loc}) ` + `| ![Current Render](${urlBase}${outputFolder}/${basefile}_${sha}_before.png) |` + ` ![This PR](${urlBase}${outputFolder}/${basefile}_${sha}_after.png) |\n`; diff --git a/scripts/generate_style.js b/scripts/generate_style.js index 3f097415c..ee5a6d453 100644 --- a/scripts/generate_style.js +++ b/scripts/generate_style.js @@ -21,7 +21,7 @@ let opts = program.opts(); let style = Style.build( config.OPENMAPTILES_URL, - "https://zelonewolf.github.io/openstreetmap-americana/sprites/sprite", + "https://americanamap.org/sprites/sprite", "https://osm-americana.github.io/fontstack66/{fontstack}/{range}.pbf", opts.locales ); diff --git a/scripts/stats.js b/scripts/stats.js index 3644eb238..ef9af2808 100644 --- a/scripts/stats.js +++ b/scripts/stats.js @@ -69,7 +69,7 @@ const distDir = opts.directory; const style = Style.build( config.OPENMAPTILES_URL, - "https://zelonewolf.github.io/openstreetmap-americana/sprites/sprite", + "https://americanamap.org/sprites/sprite", "https://osm-americana.github.io/fontstack66/{fontstack}/{range}.pbf", locales ); diff --git a/scripts/taginfo.js b/scripts/taginfo.js index a0053ee2a..c622e2241 100644 --- a/scripts/taginfo.js +++ b/scripts/taginfo.js @@ -93,7 +93,7 @@ function addNetworkTags(project) { if (!fs.existsSync(save_filename)) { fs.writeFileSync(save_filename, shieldGfx.canvas.toBuffer()); } - icon_url = `https://zelonewolf.github.io/openstreetmap-americana/shield-sample/shield_${network_filename_id}.svg`; + icon_url = `https://americanamap.org/shield-sample/shield_${network_filename_id}.svg`; } else if ( icon !== undefined && (shieldDef.colorLighten !== undefined || @@ -122,7 +122,7 @@ function addNetworkTags(project) { if (!fs.existsSync(save_filename)) { fs.writeFileSync(`${process.cwd()}/${save_filename}`, svgText); } - icon_url = `https://zelonewolf.github.io/openstreetmap-americana/shield-sample/shield_${network_filename_id}.svg`; + icon_url = `https://americanamap.org/shield-sample/shield_${network_filename_id}.svg`; } else { icon_url = `https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/${icon}.svg`; } diff --git a/shieldlib/README.md b/shieldlib/README.md index fcadf3237..838e61d9b 100644 --- a/shieldlib/README.md +++ b/shieldlib/README.md @@ -323,4 +323,4 @@ In addition to the stock drawing functions, a custom draw function can be specif ## Documentation -See [TypeDoc generated documentation](https://zelonewolf.github.io/openstreetmap-americana/shield-docs/index.html) for detailed API information. +See [TypeDoc generated documentation](https://americanamap.org/shield-docs/index.html) for detailed API information. From da083e9a2b4a9375e21cf79c4fc4bfc707cf1e30 Mon Sep 17 00:00:00 2001 From: Brian Sperlongano Date: Fri, 19 Jul 2024 12:11:59 -0400 Subject: [PATCH 2/3] Prettier icons --- icons/shield_us_nht_oreg.svg | 52 ++++---------------------------- icons/shield_us_nht_ovvi.svg | 52 ++++---------------------------- icons/shield_us_nht_semo.svg | 57 ++++-------------------------------- 3 files changed, 15 insertions(+), 146 deletions(-) diff --git a/icons/shield_us_nht_oreg.svg b/icons/shield_us_nht_oreg.svg index 8ae91012c..61434ae90 100644 --- a/icons/shield_us_nht_oreg.svg +++ b/icons/shield_us_nht_oreg.svg @@ -1,48 +1,6 @@ - - - - - - - - + + + + + diff --git a/icons/shield_us_nht_ovvi.svg b/icons/shield_us_nht_ovvi.svg index b7593a07b..a0308ec62 100644 --- a/icons/shield_us_nht_ovvi.svg +++ b/icons/shield_us_nht_ovvi.svg @@ -1,48 +1,6 @@ - - - - - - - - + + + + + diff --git a/icons/shield_us_nht_semo.svg b/icons/shield_us_nht_semo.svg index 43f8629cf..b5baff864 100644 --- a/icons/shield_us_nht_semo.svg +++ b/icons/shield_us_nht_semo.svg @@ -1,53 +1,6 @@ - - - - - - - - - - + + + + + From 560373ad84ca6ad7dcb03116d579fcd44987091b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Fri, 19 Jul 2024 15:20:57 -0700 Subject: [PATCH 3/3] Updated GitHub Pages URLs for glyphs --- scripts/extract_layer.js | 2 +- scripts/generate_style.js | 2 +- scripts/stats.js | 2 +- src/js/map_builder.ts | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/extract_layer.js b/scripts/extract_layer.js index 6e4b3ef08..420162cb7 100644 --- a/scripts/extract_layer.js +++ b/scripts/extract_layer.js @@ -24,7 +24,7 @@ const locales = opts.locales[0].split(","); const style = Style.build( config.OPENMAPTILES_URL, "https://americanamap.org/sprites/sprite", - "https://osm-americana.github.io/fontstack66/{fontstack}/{range}.pbf", + "https://font.americanamap.org/{fontstack}/{range}.pbf", locales ); diff --git a/scripts/generate_style.js b/scripts/generate_style.js index ee5a6d453..94c04f35a 100644 --- a/scripts/generate_style.js +++ b/scripts/generate_style.js @@ -22,7 +22,7 @@ let opts = program.opts(); let style = Style.build( config.OPENMAPTILES_URL, "https://americanamap.org/sprites/sprite", - "https://osm-americana.github.io/fontstack66/{fontstack}/{range}.pbf", + "https://font.americanamap.org/{fontstack}/{range}.pbf", opts.locales ); diff --git a/scripts/stats.js b/scripts/stats.js index ef9af2808..ef54f91be 100644 --- a/scripts/stats.js +++ b/scripts/stats.js @@ -70,7 +70,7 @@ const distDir = opts.directory; const style = Style.build( config.OPENMAPTILES_URL, "https://americanamap.org/sprites/sprite", - "https://osm-americana.github.io/fontstack66/{fontstack}/{range}.pbf", + "https://font.americanamap.org/{fontstack}/{range}.pbf", locales ); diff --git a/src/js/map_builder.ts b/src/js/map_builder.ts index 3577f10d5..93c7e55ac 100644 --- a/src/js/map_builder.ts +++ b/src/js/map_builder.ts @@ -32,8 +32,7 @@ export function buildStyle(): StyleSpecification { return Style.build( config.OPENMAPTILES_URL, `${baseUrl}/sprites/sprite`, - config.FONT_URL ?? - "https://osm-americana.github.io/fontstack66/{fontstack}/{range}.pbf", + config.FONT_URL ?? "https://font.americanamap.org/{fontstack}/{range}.pbf", Label.getLocales() ); }