Skip to content

Commit 91f9b98

Browse files
committed
mapbox 4, rollup 4, node 22.
lets make route a button while we debug the event handling. add 30d weather layer.
1 parent d680b7e commit 91f9b98

14 files changed

+920
-228
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* you need to set environment variable `CYCLEMAPS_MAPBOX_PUBLIC_ACCESS_TOKEN`
2626
* `echo "CYCLEMAPS_MAPBOX_PUBLIC_ACCESS_TOKEN=$CYCLEMAPS_MAPBOX_PUBLIC_ACCESS_TOKEN" >.env`
2727
* `./update.sh`
28-
* `docker run --user=$(id --user):$(id --group) --rm --volume=.:/home --workdir=/home -it node:18 npm install`
28+
* `./install.sh`
2929
* `./build.sh`
3030

3131
## non server-side layers

build-production.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
set -e #exit on failure
44

5-
#first time: npm install
6-
docker run --user=$(id --user):$(id --group) --rm --volume=.:/home --workdir=/home -it node:18 npm run build-production
5+
#first time: ./install.sh
6+
./npm.sh run build-production "$@"
77

build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
set -e #exit on failure
44

5-
#first time: npm install
6-
docker run --user=$(id --user):$(id --group) --rm --volume=.:/home --workdir=/home -it node:18 npm run build
5+
#first time: ./install.sh
6+
./npm.sh run build "$@"
77

buttons.json

+16
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"cycleway-paved": [{"propertyType": "layout", "property": "visibility", "value": "visible"}],
1818
"cyclefriendly-paved": [{"propertyType": "layout", "property": "visibility", "value": "visible"}]
1919
}},
20+
{ "id": "route", "class": "route" },
2021
{
2122
"id": "satellite",
2223
"class": "layer",
@@ -70,6 +71,21 @@
7071
"https://mapservices.weather.noaa.gov/raster/rest/services/obs/rfc_qpe/MapServer/export?bbox={bbox-epsg-3857}&size=512,512&dpi=96&format=png8&transparent=true&bboxSR=3857&imageSR=3857&layers=show:56&f=image"
7172
]
7273
}
74+
},
75+
{
76+
"id": "past-rain-30d",
77+
"class": "rain",
78+
"type": "raster",
79+
"paint": {"raster-opacity": 0.5},
80+
"beforeId": "rain-anchor",
81+
"group": "weather",
82+
"source": {
83+
"type": "raster",
84+
"tileSize": 2048,
85+
"tiles" : [
86+
"https://mapservices.weather.noaa.gov/raster/rest/services/obs/rfc_qpe/MapServer/export?bbox={bbox-epsg-3857}&size=512,512&dpi=96&format=png8&transparent=true&bboxSR=3857&imageSR=3857&layers=show:68&f=image"
87+
]
88+
}
7389
}
7490
]},
7591
{ "id": "more", "name": "", "class": "directory", "source": [

dist/cyclemaps.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/cyclemaps.js

+6-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.html

+5-3
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<li>if you notice a problem, please
185185
<a class="osm-link" href="#" onclick="window.mainControl.openOsmEdit();">edit osm</a></li>
186186
<li>"surface" is how we know what is unpaved</li>
187-
<li>changes to osm take two weeks to propagate</li>
187+
<li>changes to osm take months to propagate</li>
188188
</ul>
189189

190190
<p>thanks to the many projects that this site depends on.</p>
@@ -197,12 +197,14 @@
197197
<li><a href="https://github.com/maptiler/tileserver-gl/" target="_blank">maptiler tile server</a></li>
198198
<li><a href="https://www.postgresql.org/" target="_blank">postgresql</a> &amp; <a href="https://postgis.net/" target="_blank">postgis</a></li>
199199
<li><a href="https://www.wikidata.org/" target="_blank">wikidata</a></li>
200-
<li><a href="http://project-osrm.org/" target="_blank">project osrm</a></li>
200+
<!--<li><a href="https://project-osrm.org/" target="_blank">project osrm</a></li>-->
201+
<li>mapbox satellite &amp; routing</li>
201202
<!-- openmaptiles-tools -->
202203
<li><a href="https://www.naturalearthdata.com/" target="_blank">natural earth</a></li>
203204
<li><a href="https://github.com/pnorman/osmborder" target="_blank">osmborder</a></li>
204205
<li><a href="https://omniscale.com/" target="_blank">omniscale</a></li>
205-
<li><a href="https://github.com/maplibre/maplibre-gl-js" target="_blank">maplibre</a></li>
206+
<li><a href="https://github.com/maplibre/maplibre-gl-js" target="_blank">maplibre</a> &amp; maplibre-directions</li>
207+
<li><a href="https://github.com/jimmyrocks/maplibre-gl-vector-text-protocol/" target="_blank">maplibre-gl vector-text-protocol</a></li>
206208
<li><a href="https://water.weather.gov/precip/about.php" target="_blank">national weather service advanced hydrologic prediction service</a></li>
207209
<li><a href="https://maputnik.github.io/" target="_blank">maputnik</a></li>
208210
<li><a href="https://www.docker.com/" target="_blank">docker</a> / <a href="https://ubuntu.com/" target="_blank">ubuntu</a> / <a href="https://www.gnu.org/" target="_blank">gnu</a> / <a href="https://www.kernel.org/" target="_blank">linux</a></li>

install.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
set -e #exit on failure
4+
5+
./npm.sh install "$@"
6+

npm.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
set -e #exit on failure
4+
5+
docker run --user=$(id --user):$(id --group) --rm --volume=.:/home --workdir=/home -it node:22 npm "$@"
6+

0 commit comments

Comments
 (0)