Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update leaflet to 1.9.4 and carto to 5.8.0 #403

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update leaflet to 1.9.4 and carto to 5.8.0 #403

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a20108
Update to carto 5.8.0
centic9 Dec 9, 2023
296766a
Update to Leaflet 1.9.4
centic9 Dec 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,8 @@ RUN apt-get update \

FROM compiler-common AS compiler-stylesheet
RUN cd ~ \
&& git clone --single-branch --branch v5.4.0 https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 \
&& git clone --single-branch --branch v5.8.0 https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 \
&& cd openstreetmap-carto \
&& sed -i 's/, "unifont Medium", "Unifont Upper Medium"//g' style/fonts.mss \
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All these font-replacements are not necessary any more now

&& sed -i 's/"Noto Sans Tibetan Regular",//g' style/fonts.mss \
&& sed -i 's/"Noto Sans Tibetan Bold",//g' style/fonts.mss \
&& sed -i 's/Noto Sans Syriac Eastern Regular/Noto Sans Syriac Regular/g' style/fonts.mss \
&& rm -rf .git

###########################################################################################################
Expand Down Expand Up @@ -115,8 +111,10 @@ RUN ln -sf /dev/stdout /var/log/apache2/access.log \
# leaflet
COPY leaflet-demo.html /var/www/html/index.html
RUN cd /var/www/html/ \
&& wget https://github.com/Leaflet/Leaflet/releases/download/v1.8.0/leaflet.zip \
&& wget https://github.com/Leaflet/Leaflet/releases/download/v1.9.4/leaflet.zip \
&& unzip leaflet.zip \
&& mv dist/* . \
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Zip-Package now contains a sub-dir "dist", so we need to move the content back to the main directory.

&& rmdir dist \
&& rm leaflet.zip

# Icon
Expand Down