Skip to content

Commit

Permalink
Merge branch 'main' into aaroads
Browse files Browse the repository at this point in the history
  • Loading branch information
1ec5 committed Jul 19, 2024
2 parents cd94a5a + 66ac4b2 commit cec5cf5
Show file tree
Hide file tree
Showing 13 changed files with 155 additions and 154 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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://aaroads-wiki.github.io/openstreetmap-americana/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:

Expand Down
4 changes: 4 additions & 0 deletions icons/poi_fire_station.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 5 additions & 47 deletions icons/shield_us_nht_oreg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 5 additions & 47 deletions icons/shield_us_nht_ovvi.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 5 additions & 52 deletions icons/shield_us_nht_semo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion scripts/extract_layer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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://aaroads-wiki.github.io/openstreetmap-americana/sprites/sprite",
"https://osm-americana.github.io/fontstack66/{fontstack}/{range}.pbf",
locales
);
Expand Down
2 changes: 1 addition & 1 deletion scripts/folder_diff.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ fs.readdirSync(outputFolder)
// Add an entry to the markdown table
const loc = getLocationByName(basefile);
mdContent +=
`| ${basefile}<br>${loc}<br>[Current Render](https://zelonewolf.github.io/openstreetmap-americana/#map=${loc})` +
`| ${basefile}<br>${loc}<br>[Current Render](https://aaroads-wiki.github.io/openstreetmap-americana/#map=${loc})` +
`<br>[This PR](${urlBase}#map=${loc}) ` +
`| ![Current Render](${urlBase}${outputFolder}/${basefile}_${sha}_before.png) |` +
` ![This PR](${urlBase}${outputFolder}/${basefile}_${sha}_after.png) |\n`;
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate_style.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ let opts = program.opts();

let style = Style.build(
config.OPENMAPTILES_URL,
"https://zelonewolf.github.io/openstreetmap-americana/sprites/sprite",
"https://aaroads-wiki.github.io/openstreetmap-americana/sprites/sprite",
"https://osm-americana.github.io/fontstack66/{fontstack}/{range}.pbf",
opts.locales
);
Expand Down
2 changes: 1 addition & 1 deletion scripts/stats.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const distDir = opts.directory;

const style = Style.build(
config.OPENMAPTILES_URL,
"https://zelonewolf.github.io/openstreetmap-americana/sprites/sprite",
"https://aaroads-wiki.github.io/openstreetmap-americana/sprites/sprite",
"https://osm-americana.github.io/fontstack66/{fontstack}/{range}.pbf",
locales
);
Expand Down
4 changes: 2 additions & 2 deletions scripts/taginfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -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://aaroads-wiki.github.io/openstreetmap-americana/shield-sample/shield_${network_filename_id}.svg`;
} else if (
icon !== undefined &&
(shieldDef.colorLighten !== undefined ||
Expand Down Expand Up @@ -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://aaroads-wiki.github.io/openstreetmap-americana/shield-sample/shield_${network_filename_id}.svg`;
} else {
icon_url = `https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/${icon}.svg`;
}
Expand Down
Loading

0 comments on commit cec5cf5

Please sign in to comment.