diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 528a944bf..ee98eecfc 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,3 +1,3 @@ # Code of Conduct -The OpenStreetMap Americana project has [opted in](https://github.com/ZeLonewolf/openstreetmap-americana/pull/489) to the [OpenStreetMap US Code of Conduct](https://wiki.openstreetmap.org/wiki/Foundation/Local_Chapters/United_States/Code_of_Conduct_Committee/OSM_US_Code_of_Conduct) (CoC) and [Process for Moderation](https://wiki.openstreetmap.org/wiki/Foundation/Local_Chapters/United_States/Code_of_Conduct_Committee/ModerationProcess). +The OpenStreetMap Americana project has [opted in](https://github.com/osm-americana/openstreetmap-americana/pull/489) to the [OpenStreetMap US Code of Conduct](https://wiki.openstreetmap.org/wiki/Foundation/Local_Chapters/United_States/Code_of_Conduct_Committee/OSM_US_Code_of_Conduct) (CoC) and [Process for Moderation](https://wiki.openstreetmap.org/wiki/Foundation/Local_Chapters/United_States/Code_of_Conduct_Committee/ModerationProcess). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3ba38d36e..9bc473aa4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -79,8 +79,8 @@ sudo apt install nodejs [51]: https://www.macports.org/ [52]: https://nodejs.org [60]: https://docs.microsoft.com/en-us/windows/wsl/install-win10 -[62]: https://github.com/ZeLonewolf/openstreetmap-americana/issues/132 -[63]: https://github.com/ZeLonewolf/openstreetmap-americana/issues/132#issuecomment-1027274543 +[62]: https://github.com/osm-americana/openstreetmap-americana/issues/132 +[63]: https://github.com/osm-americana/openstreetmap-americana/issues/132#issuecomment-1027274543 ## Install Project Level NPM Dependencies @@ -353,7 +353,7 @@ This style strives to draw representative highway shields wherever they are tagg - Shields for route networks where each individual route is identified by a color, rather than a number or letter. Such cases include: - **Allegheny County, PA Belt Routes**. Shields for this system use colors, with a colored circle and the words " BELT". These shields are drawn as squares with colored circles, with the `ref` values correctly corresponding to the text on the shield. Because of the common design (white shield with colored circle), these shields are properly part of a common route network. Special code is needed to convert the textual ref values to the colors displayed in the shield. - **Branson, MO color-coded routes**. Shields for this system use colors, with a colored rectangle and the words " ROUTE". These shields are drawn as squares with colored rectangles, with the `ref` values correctly corresponding to the text on the shield. Because of the common design (green shield with colored rectangle), these shields are properly part of a common route network. Special code is needed to convert the textual ref values to the colors displayed in the shield. -- Shields with a stacked ref configuration, with `/` separating the two lines of text in the `ref` value. Currently, these `ref` values are displayed verbatim on one line, and the code necessary for stacked ref rendering has not been written yet ([#366](https://github.com/ZeLonewolf/openstreetmap-americana/issues/366)). Such cases include: +- Shields with a stacked ref configuration, with `/` separating the two lines of text in the `ref` value. Currently, these `ref` values are displayed verbatim on one line, and the code necessary for stacked ref rendering has not been written yet ([#366](https://github.com/osm-americana/openstreetmap-americana/issues/366)). Such cases include: - **Italy "Diramazione" (branch) motorways**. Between their main autostrade "A" roads, the Italian motorway network has branch motorways which carry the name of both highways that they connect. For example, the A7 and A26 motorways have a branch motorway named A7/A26, which is correctly tagged `ref=A7/A26` and shown on shields with the two numbers stacked vertically. - **West Virginia County Routes**. The West Virginia Department of Transportation posts County Routes, which can have shields with two stacked numbers. For example, in Mercer County, County Route 460/1 is a branch off U.S. Route 460, and County Route 27/6 is a branch off County Route 27. These routes are correctly tagged `ref=460/1` and `ref=27/6` respectively, and shown on shields with the two numbers stacked vertically. - The [highway classification system of the United Kingdom](https://wiki.openstreetmap.org/wiki/Roads_in_the_United_Kingdom). In the UK, mappers need to and are able to tag the actual official road classifications independently of route networks. The color and style of route signage is based on a strict 1:1 correspondence with the `highway=*` value of the underlying road, and **not** based on M/A/B highway network type. While "M" roads are always motorways with blue route symbology, "A" roads can anything from primary through motorway, and thus may take one of three colors and may change along a single route. Even if mappers were to create route relations containing all roads with the same route number, these relations would not be usable for determining how to render route symbology. Additionally, there are no route concurrencies in the UK; all roads that are `highway=secondary` or higher carry a single `ref` value that can be directly rendered into a shield without pre-processing. There is established data consumers support for this highway classification-based symbology system, most notably OpenMapTiles, which has provided pseudo-network values for UK routes since the project's inception. Therefore, this project consumes the UK pseudo-network scheme established by OpenMapTiles and colors UK route network symbology strictly based on `highway=` consistent with UK signage. @@ -367,12 +367,12 @@ For testing out changes across a variety of different shield designs and ref len 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: -https://github.com/ZeLonewolf/openstreetmap-americana/blob/581e1e5d97f5745c1bf764689439d93403888505/src/shieldtest.js#L16-L31 -https://github.com/ZeLonewolf/openstreetmap-americana/blob/581e1e5d97f5745c1bf764689439d93403888505/src/shieldtest.js#L203-L218 +https://github.com/osm-americana/openstreetmap-americana/blob/581e1e5d97f5745c1bf764689439d93403888505/src/shieldtest.js#L16-L31 +https://github.com/osm-americana/openstreetmap-americana/blob/581e1e5d97f5745c1bf764689439d93403888505/src/shieldtest.js#L203-L218 To test with a list of all the supported networks in the style this line can be uncommented: -https://github.com/ZeLonewolf/openstreetmap-americana/blob/581e1e5d97f5745c1bf764689439d93403888505/src/shieldtest.js#L200-L201 +https://github.com/osm-americana/openstreetmap-americana/blob/581e1e5d97f5745c1bf764689439d93403888505/src/shieldtest.js#L200-L201 This results in a very long page and can be quite slow or even crash the browser tab. diff --git a/README.md b/README.md index 84995a491..f91fec187 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ Americana displays custom route shields for routes in all U.S. states and territ Countries -We are hoping that it will support more countries; you can [help us](https://github.com/ZeLonewolf/openstreetmap-americana/projects/1)! +We are hoping that it will support more countries; you can [help us](https://github.com/osm-americana/openstreetmap-americana/projects/1)! ## Tile Server diff --git a/TILE_USAGE.md b/TILE_USAGE.md index 6b818ca57..eb7d89690 100644 --- a/TILE_USAGE.md +++ b/TILE_USAGE.md @@ -16,7 +16,7 @@ Thank you for using the OpenStreetMap Americana [Community Vector Tile Server](h The Server is primarily intended for personal, non-commercial use. You are welcome to use the tiles for personal or community projects, educational purposes, or non-profit initiatives that do not generate revenue. There are several [guides](https://www.openstreetmap.org/user/ZeLonewolf/diary/401697) available for commercial users that desire to run a vector tile server at low cost. Note that this policy only applies to the tile server usage. Anyone is free to use the OSM Americana on their own tile server, even for a commercial endeavor. 4. Domain Whitelisting: - Tile usage from localhost and \*.github.io is permitted, which are common ways that most developers will access the tile server when starting a new project. If you wish to use the tiles under your own domain name, please contact the Americana team on [Slack](https://osmus.slack.com/archives/C01V02K52UX) (preferred) or [GitHub](https://github.com/ZeLonewolf/openstreetmap-americana) and provide your domain name(s) in order to add your domain to the CORS (Cross-Origin Resource Sharing) white list. This will allow you to fetch tiles directly from your domain. This whitelist is subject to the discretion and may be modified or removed at any time, however, permission is routinely given for community and hobby projects. + Tile usage from localhost and \*.github.io is permitted, which are common ways that most developers will access the tile server when starting a new project. If you wish to use the tiles under your own domain name, please contact the Americana team on [Slack](https://osmus.slack.com/archives/C01V02K52UX) (preferred) or [GitHub](https://github.com/osm-americana/openstreetmap-americana) and provide your domain name(s) in order to add your domain to the CORS (Cross-Origin Resource Sharing) white list. This will allow you to fetch tiles directly from your domain. This whitelist is subject to the discretion and may be modified or removed at any time, however, permission is routinely given for community and hobby projects. 5. Usage Limits: To ensure fair usage and prevent abuse, the Server may enforce limits on tile requests for individual users or domains. If your usage exceeds reasonable levels or begins to strain the server's resources, the administrator reserves the right to restrict or terminate access to the Server. Users whose usage becomes excessive may be requested to set up their own tile server. diff --git a/package.json b/package.json index a55d536da..096fcdd1e 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "type": "module", "repository": { "type": "git", - "url": "git+https://github.com/zelonewolf/openstreetmap-americana.git" + "url": "git+https://github.com/osm-americana/openstreetmap-americana.git" }, "workspaces": [ "shieldlib" diff --git a/scripts/taginfo.js b/scripts/taginfo.js index c622e2241..96d14230e 100644 --- a/scripts/taginfo.js +++ b/scripts/taginfo.js @@ -124,7 +124,7 @@ function addNetworkTags(project) { } 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`; + icon_url = `https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/${icon}.svg`; } let description = `Roads carrying routes in this network are marked by `; diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json index 70a362a43..9f332a06e 100644 --- a/scripts/taginfo_template.json +++ b/scripts/taginfo_template.json @@ -3,9 +3,9 @@ "project": { "name": "OpenStreetMap Americana", "description": "A quintessentially American map style.", - "project_url": "https://github.com/ZeLonewolf/openstreetmap-americana/", + "project_url": "https://github.com/osm-americana/openstreetmap-americana/", "doc_url": "https://wiki.openstreetmap.org/wiki/OpenStreetMap_Americana", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/doc-img/osm-americana-logo.png", + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/doc-img/osm-americana-logo.png", "contact_name": "Brian Sperlongano", "contact_email": "zelonewolf@gmail.com" }, @@ -21,7 +21,7 @@ "object_types": ["node"], "description": "Marks the city with a national capital icon.", "doc_url": "https://openmaptiles.org/schema/#capital", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/star_nation_capital.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/star_nation_capital.svg" }, { "key": "capital", @@ -29,7 +29,7 @@ "object_types": ["node"], "description": "Marks the city with a national capital icon.", "doc_url": "https://openmaptiles.org/schema/#capital", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/star_nation_capital.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/star_nation_capital.svg" }, { "key": "capital", @@ -37,7 +37,7 @@ "object_types": ["node"], "description": "Marks the city with a state capital icon.", "doc_url": "https://openmaptiles.org/schema/#capital", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/star_state_capital.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/star_state_capital.svg" }, { "key": "capital", @@ -45,7 +45,7 @@ "object_types": ["node"], "description": "Marks the city with a state capital icon.", "doc_url": "https://openmaptiles.org/schema/#capital", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/star_state_capital.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/star_state_capital.svg" }, { "key": "capital", @@ -53,7 +53,7 @@ "object_types": ["node"], "description": "Marks the place with a local capital icon.", "doc_url": "https://openmaptiles.org/schema/#capital", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/place_dot_in_circle.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/place_dot_in_circle.svg" }, { "key": "capital", @@ -61,7 +61,7 @@ "object_types": ["node"], "description": "Marks the place with a local capital icon.", "doc_url": "https://openmaptiles.org/schema/#capital", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/place_dot_in_circle.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/place_dot_in_circle.svg" }, { "key": "boundary", @@ -139,7 +139,7 @@ "object_types": ["node"], "description": "Cities are marked with a dot.", "doc_url": "https://openmaptiles.org/schema/#place", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/place_dot.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/place_dot.svg" }, { "key": "place", @@ -147,7 +147,7 @@ "object_types": ["node"], "description": "Towns are marked with a dot.", "doc_url": "https://openmaptiles.org/schema/#place", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/place_dot.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/place_dot.svg" }, { "key": "place", @@ -155,7 +155,7 @@ "object_types": ["node"], "description": "Villages are marked with a dot.", "doc_url": "https://openmaptiles.org/schema/#place", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/place_dot.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/place_dot.svg" }, { "key": "disputed", @@ -239,7 +239,7 @@ "object_types": ["node", "area"], "description": "Military air bases are marked by a fighter jet.", "doc_url": "https://openmaptiles.org/schema/#class", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_military_plane.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_military_plane.svg" }, { "key": "aerodrome:type", @@ -254,7 +254,7 @@ "object_types": ["node", "area"], "description": "Military air bases are marked by a fighter jet.", "doc_url": "https://openmaptiles.org/schema/#class", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_military_plane.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_military_plane.svg" }, { "key": "military", @@ -262,7 +262,7 @@ "object_types": ["node", "area"], "description": "Military air bases are marked by a fighter jet.", "doc_url": "https://openmaptiles.org/schema/#class", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_military_plane.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_military_plane.svg" }, { "key": "aerialway", @@ -499,7 +499,7 @@ "object_types": ["node", "area"], "description": "Fuel stations are marked by an icon representing a gas pump.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_fuel.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_fuel.svg" }, { "key": "amenity", @@ -507,7 +507,7 @@ "object_types": ["node", "area"], "description": "Schools are marked by an icon representing a schoolhouse with a triangular flag raised above it.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_school.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_school.svg" }, { "key": "amenity", @@ -515,7 +515,7 @@ "object_types": ["node", "area"], "description": "Taxi stands are marked by an icon representing the front view of a taxi cab.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_taxi.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_taxi.svg" }, { "key": "amenity", @@ -523,7 +523,7 @@ "object_types": ["node", "area"], "description": "Schools are marked by an icon representing a schoolhouse with a triangular flag raised above it.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_school.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_school.svg" }, { "key": "amenity", @@ -531,7 +531,7 @@ "object_types": ["node", "area"], "description": "Colleges are marked by an icon representing a mortarboard cap.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_mortarboard.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_mortarboard.svg" }, { "key": "amenity", @@ -539,7 +539,7 @@ "object_types": ["node", "area"], "description": "Colleges are marked by an icon representing a mortarboard cap.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_mortarboard.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_mortarboard.svg" }, { "key": "amenity", @@ -547,7 +547,7 @@ "object_types": ["node", "area"], "description": "Cafes are marked by an icon representing a coffee cup.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_coffee_cup.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_coffee_cup.svg" }, { "key": "amenity", @@ -555,7 +555,7 @@ "object_types": ["node", "area"], "description": "Bars are marked by an icon representing a martini glass.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_martini_glass.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_martini_glass.svg" }, { "key": "amenity", @@ -563,7 +563,7 @@ "object_types": ["node", "area"], "description": "Bars are marked by an icon representing a martini glass.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_martini_glass.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_martini_glass.svg" }, { "key": "amenity", @@ -571,7 +571,7 @@ "object_types": ["node", "area"], "description": "Hospitals are marked by a white letter 'H' in a blue shield.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_hospital.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_hospital.svg" }, { "key": "amenity", @@ -579,7 +579,7 @@ "object_types": ["node", "area"], "description": "Medical offices are marked by a white cross in a blue shield.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_health_cross.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_health_cross.svg" }, { "key": "amenity", @@ -587,7 +587,7 @@ "object_types": ["node", "area"], "description": "Police stations are marked by an icon representing a police badge.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_police_shield.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_police_shield.svg" }, { "key": "amenity", @@ -595,7 +595,7 @@ "object_types": ["node", "area"], "description": "Fire stations are marked by an icon representing a firefighter's badge.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_fire_station.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_fire_station.svg" }, { "key": "amenity", @@ -603,7 +603,7 @@ "object_types": ["node", "area"], "description": "City halls are marked by an icon representing a domed building with a rectangular flag raised above it.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_town_hall.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_town_hall.svg" }, { "key": "amenity", @@ -611,7 +611,7 @@ "object_types": ["node", "area"], "description": "Post offices are marked by an icon representing an envelope.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_envelope.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_envelope.svg" }, { "key": "tourism", @@ -619,7 +619,7 @@ "object_types": ["node", "area"], "description": "Guest houses are marked by an icon representing a person laying in a bed.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_hotel.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_hotel.svg" }, { "key": "tourism", @@ -627,7 +627,7 @@ "object_types": ["node", "area"], "description": "Hostels are marked by an icon representing two people laying in a bunk bed.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_hostel.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_hostel.svg" }, { "key": "tourism", @@ -635,7 +635,7 @@ "object_types": ["node", "area"], "description": "Hotels are marked by an icon representing a person laying in a bed.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_hotel.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_hotel.svg" }, { "key": "tourism", @@ -643,7 +643,7 @@ "object_types": ["node", "area"], "description": "Motels are marked by an icon representing a person laying in a bed.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_hotel.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_hotel.svg" }, { "key": "tourism", @@ -651,7 +651,7 @@ "object_types": ["node", "area"], "description": "Museums are marked by an icon representing a Classical columned building.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_museum.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_museum.svg" }, { "key": "amenity", @@ -659,7 +659,7 @@ "object_types": ["node", "area"], "description": "Medical offices are marked by a white cross in a blue shield.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_health_cross.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_health_cross.svg" }, { "key": "amenity", @@ -667,7 +667,7 @@ "object_types": ["node", "area"], "description": "Libraries are marked by an icon representing a book.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_book_upright.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_book_upright.svg" }, { "key": "amenity", @@ -675,7 +675,7 @@ "object_types": ["node", "area"], "description": "Parking lots are marked by a blue letter 'P'.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_p.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_p.svg" }, { "key": "amenity", @@ -683,7 +683,7 @@ "object_types": ["node", "area"], "description": "Places of worship are marked by a square representing a building, topped with a finial representing the religion for common religions.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_generic.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_pow_generic.svg" }, { "key": "amenity", @@ -691,7 +691,7 @@ "object_types": ["node", "area"], "description": "Bus stations are marked by an icon depicting the front of a bus.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_bus.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_bus.svg" }, { "key": "highway", @@ -699,7 +699,7 @@ "object_types": ["node"], "description": "Bus stops are marked by an icon depicting the front of a bus.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_bus.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_bus.svg" }, { "key": "railway", @@ -707,7 +707,7 @@ "object_types": ["node"], "description": "Rail halts are marked by an icon depicting the front of a train.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_rail.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_rail.svg" }, { "key": "railway", @@ -715,7 +715,7 @@ "object_types": ["node", "area"], "description": "Rail stations are marked by an icon depicting the front of a train.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_rail.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_rail.svg" }, { "key": "aerialway", @@ -723,7 +723,7 @@ "object_types": ["node", "area"], "description": "Aerialway stations are marked by an icon depicting an aerial tramway car.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_aerialway_circle.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_aerialway_circle.svg" }, { "key": "railway", @@ -731,7 +731,7 @@ "object_types": ["node"], "description": "Tram stops are marked by an icon depicting the front of a train.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_rail.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_rail.svg" }, { "key": "station", @@ -739,7 +739,7 @@ "object_types": ["node"], "description": "Subway stations are marked by an icon depicting the front of a train.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_rail.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_rail.svg" }, { "key": "religion", @@ -747,7 +747,7 @@ "object_types": ["node", "area"], "description": "Buddhist places of worship are marked by an icon representing a building topped by a dharmachakra.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_buddhist.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_pow_buddhist.svg" }, { "key": "religion", @@ -755,7 +755,7 @@ "object_types": ["node", "area"], "description": "Christian places of worship are marked by an icon representing a building topped by a cross.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_christian.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_pow_christian.svg" }, { "key": "religion", @@ -763,7 +763,7 @@ "object_types": ["node", "area"], "description": "Hindu places of worship are marked by an icon representing a building topped by an om symbol.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_hindu.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_pow_hindu.svg" }, { "key": "religion", @@ -771,7 +771,7 @@ "object_types": ["node", "area"], "description": "Jewish places of worship are marked by an icon representing a building topped by a star of David.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_jewish.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_pow_jewish.svg" }, { "key": "religion", @@ -779,7 +779,7 @@ "object_types": ["node", "area"], "description": "Muslim places of worship are marked by an icon representing a building topped by a star and crescent.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_muslim.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_pow_muslim.svg" }, { "key": "religion", @@ -787,7 +787,7 @@ "object_types": ["node", "area"], "description": "Sikh places of worship are marked by an icon representing a building topped by a khanda.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_sikh.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_pow_sikh.svg" }, { "key": "religion", @@ -795,7 +795,7 @@ "object_types": ["node", "area"], "description": "Shinto places of worship are marked by an icon representing a building topped by a torii.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_shinto.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_pow_shinto.svg" }, { "key": "religion", @@ -803,7 +803,7 @@ "object_types": ["node", "area"], "description": "Taoist places of worship are marked by an icon representing a building topped by a yin-yang symbol.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_taoist.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_pow_taoist.svg" }, { "key": "shop", @@ -811,7 +811,7 @@ "object_types": ["node", "area"], "description": "Bookstores are marked by an icon representing a book.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_book_upright.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_book_upright.svg" }, { "key": "shop", @@ -819,7 +819,7 @@ "object_types": ["node", "area"], "description": "Car dealerships are marked by an icon representing a front facing vehicle.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_car_shop.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_car_shop.svg" }, { "key": "shop", @@ -827,7 +827,7 @@ "object_types": ["node", "area"], "description": "Car mechanic shops are marked by an icon representing a front facing vehicle with a wrench above it.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_car_repair.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_car_repair.svg" }, { "key": "shop", @@ -835,7 +835,7 @@ "object_types": ["node", "area"], "description": "Supermarkets are marked by an icon representing a grocery cart.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_supermarket.svg" + "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_supermarket.svg" }, { "key": "highway", diff --git a/shieldlib/README.md b/shieldlib/README.md index 838e61d9b..32899597d 100644 --- a/shieldlib/README.md +++ b/shieldlib/README.md @@ -10,7 +10,7 @@ Rendering shields requires the following compoments: 1. **Encode shield information in vector tiles**. First, your tiles must contain the information which tells the shield renderer what shields to draw. In OpenMapTiles, shield information is encoded in the [`transportation_name`](https://openmaptiles.org/schema/#transportation_name) vector tile layer with a series of attributes named `route_1`, `route_2`, etc. Each attribute contains a text string which contains all of the information needed to determine which graphic to display, including numeric route number if the shield is numbered. However, this library allows you to specify how the shield information has been encoded, and it's possible to stitch together data from multiple fields when encoding shield data. -2. **Expose shield information in a style layer**. Next, route information must be exposed in a maplibre expression using [image](https://maplibre.org/maplibre-gl-js-docs/style-spec/expressions/#types-image) in a structured string containing the route information. For example, you might encode Interstate 95 as an image named `shield|US:I=95`. Normally, the image expression is used to point to pre-designated sprites in a sprite sheet, but in this case, we're pointing to a sprite which doesn't exist called `shield|US:I=95`. This will trigger a `styleimagemissing` event which allows the shield renderer to create the required graphic on the fly. As an example of how to encode shield information, see OSM Americana's [`highway_shield`](https://github.com/ZeLonewolf/openstreetmap-americana/blob/main/src/layer/highway_shield.js) style layer. +2. **Expose shield information in a style layer**. Next, route information must be exposed in a maplibre expression using [image](https://maplibre.org/maplibre-gl-js-docs/style-spec/expressions/#types-image) in a structured string containing the route information. For example, you might encode Interstate 95 as an image named `shield|US:I=95`. Normally, the image expression is used to point to pre-designated sprites in a sprite sheet, but in this case, we're pointing to a sprite which doesn't exist called `shield|US:I=95`. This will trigger a `styleimagemissing` event which allows the shield renderer to create the required graphic on the fly. As an example of how to encode shield information, see OSM Americana's [`highway_shield`](https://github.com/osm-americana/openstreetmap-americana/blob/main/src/layer/highway_shield.js) style layer. 3. **Define a parser that describes how route information is encoded**. There are three parts to a route definition: diff --git a/shieldlib/package.json b/shieldlib/package.json index f92282f28..d6428db48 100644 --- a/shieldlib/package.json +++ b/shieldlib/package.json @@ -41,12 +41,12 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/ZeLonewolf/openstreetmap-americana.git" + "url": "git+https://github.com/osm-americana/openstreetmap-americana.git" }, "bugs": { - "url": "https://github.com/ZeLonewolf/openstreetmap-americana/issues" + "url": "https://github.com/osm-americana/openstreetmap-americana/issues" }, - "homepage": "https://github.com/ZeLonewolf/openstreetmap-americana#readme", + "homepage": "https://github.com/osm-americana/openstreetmap-americana#readme", "dependencies": { "@types/node": "^20.8.4", "color-rgba": "^2.4.0", diff --git a/src/index.html b/src/index.html index fff7f541d..51b69f7d6 100644 --- a/src/index.html +++ b/src/index.html @@ -100,7 +100,7 @@
- export const networkPredicate: StringPredicate = (network: string) => // On recreational route relations, network=* indicates the network's scope, // not the network itself. - // https://github.com/ZeLonewolf/openstreetmap-americana/issues/94 + // https://github.com/osm-americana/openstreetmap-americana/issues/94 !/^[lrni][chimpw]n$/.test(network); export const routeParser: RouteParser = { diff --git a/src/layer/road_label.js b/src/layer/road_label.js index c820b8631..82a419824 100644 --- a/src/layer/road_label.js +++ b/src/layer/road_label.js @@ -144,7 +144,7 @@ export const smallService = { }; // A spacer label on each bridge to push any waterway label away from the bridge. -// https://github.com/ZeLonewolf/openstreetmap-americana/issues/198 +// https://github.com/osm-americana/openstreetmap-americana/issues/198 export const bridgeSpacer = { id: "bridge_spacer", type: "symbol", diff --git a/src/layer/transportation_label.js b/src/layer/transportation_label.js index 45b3f30f3..f838c78fc 100644 --- a/src/layer/transportation_label.js +++ b/src/layer/transportation_label.js @@ -166,7 +166,7 @@ export const label = { }; // A spacer label on each bridge to push any waterway label away from the bridge. -// https://github.com/ZeLonewolf/openstreetmap-americana/issues/198 +// https://github.com/osm-americana/openstreetmap-americana/issues/198 export const bridgeSpacer = { id: "bridge_spacer", type: "symbol",