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.

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

style with symbols #79

Open
wants to merge 209 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 195 commits
Commits
Show all changes
209 commits
Select commit Hold shift + click to select a range
89245fb
changed query to get gen0 table instead of missing gen00
Nicolasribot Dec 4, 2016
93e3809
adapted for local settings
Nicolasribot Dec 4, 2016
ffa05a9
custom queries to adapt a default imposm3s import (missing some tables)
Nicolasribot Dec 4, 2016
05ca4ff
imposm3 conf for EC2
Nicolasribot Dec 4, 2016
e75759b
cache set
Nicolasribot Dec 4, 2016
63a78e9
db port...
Nicolasribot Dec 4, 2016
97c5ab2
db user...
Nicolasribot Dec 4, 2016
7e21e34
restored gen00 table
Nicolasribot Dec 4, 2016
123e026
mapcache conf file for OSM Tiling (imposm3 DB schema)
Nicolasribot Dec 4, 2016
9b95d17
EC2 paths
Nicolasribot Dec 4, 2016
7201769
metatiles added
Nicolasribot Dec 4, 2016
489ee5c
cache on the SSD drive :))
Nicolasribot Dec 4, 2016
cdf73f4
no-labels and labels-only styles added.
Nicolasribot Dec 6, 2016
3ceb702
absolute url without host
Nicolasribot Dec 6, 2016
be8687f
server url added
Nicolasribot Dec 6, 2016
f08177e
UI changed
Nicolasribot Dec 6, 2016
4280d9b
server url
Nicolasribot Dec 6, 2016
b84b19b
b&w removed for imagetype
Nicolasribot Dec 6, 2016
2bb0ee9
right db user
Nicolasribot Dec 6, 2016
90ae893
added zoom level leaflet plugin
Nicolasribot Dec 6, 2016
7777722
server url
Nicolasribot Dec 6, 2016
dd5534f
buildings integrated to google-no-labels style
Nicolasribot Dec 7, 2016
60d36e0
Server urls and new google-no-labels layer
Nicolasribot Dec 7, 2016
0f636ae
tilesets names correceted
Nicolasribot Dec 7, 2016
701d482
New mapcache conf and demo site: custom template enabled for google-n…
Nicolasribot Dec 7, 2016
910f1ff
corrected mapfile url
Nicolasribot Dec 7, 2016
a77ae22
put in readonly cache
Nicolasribot Dec 7, 2016
5e316fd
reactivated all basemap styles in demo
Nicolasribot Dec 7, 2016
92399d7
Changed path to data storage (new EBS volume)
Nicolasribot Dec 7, 2016
83a411e
new data path
Nicolasribot Dec 7, 2016
b2be201
new data path for data_big2 xfs mount
Nicolasribot Dec 9, 2016
74fd2b2
server cache path
Nicolasribot Dec 13, 2016
b97441f
New symbol style
Nicolasribot Dec 13, 2016
38cea1f
empty lines removed
Nicolasribot Dec 13, 2016
61ee6c6
server map url
Nicolasribot Dec 13, 2016
71231b6
default layer set to google no label, mapcache TMS
Nicolasribot Dec 13, 2016
f359a16
new layers definitions (MapCache and Mapserver distinct) and grayscal…
Nicolasribot Dec 13, 2016
1b51cd3
typo grayscale
Nicolasribot Dec 13, 2016
b471eec
typo ts name
Nicolasribot Dec 13, 2016
c90c2c5
seeder.xml removed, not necessary
Nicolasribot Dec 13, 2016
60fd35d
symbols style completed
Nicolasribot Dec 25, 2016
586a4c2
OSM symbols added.
Nicolasribot Dec 25, 2016
8399302
symbols-only style and script to generate sample style images @ zoom …
Nicolasribot Dec 26, 2016
7c8a4f9
db user
Nicolasribot Dec 26, 2016
4075b99
server params
Nicolasribot Dec 26, 2016
21a634d
server params
Nicolasribot Dec 26, 2016
30cb153
server params
Nicolasribot Dec 26, 2016
635442a
new mapping for access and power columns
Nicolasribot Dec 26, 2016
2d41528
script to convert to grayscale
Nicolasribot Dec 26, 2016
7f82b16
icon for dept store
Nicolasribot Dec 26, 2016
0f4d169
grayscale theme added
Nicolasribot Dec 26, 2016
fbf5982
grayscale theme renamed
Nicolasribot Dec 26, 2016
34e7aba
grayscale theme outlined
Nicolasribot Dec 26, 2016
ede874c
symbols-only style and S3 cache
Nicolasribot Dec 27, 2016
3e7ca64
added mapcache symbols-only layer
Nicolasribot Dec 27, 2016
3971425
S3 cache config corrected
Nicolasribot Dec 27, 2016
4d6fd4d
added S3 pure leaflet layers
Nicolasribot Dec 27, 2016
0bfee3e
corrected S3 cache URL
Nicolasribot Dec 27, 2016
ff9b232
test S3 URL as HTTP instead of HTTPS
Nicolasribot Dec 27, 2016
a9eede3
reordered layers for transparent on top
Nicolasribot Dec 27, 2016
c18dec9
symbols style and heatmap prices demo
Nicolasribot Dec 29, 2016
c5dcc87
style and heat.js
Nicolasribot Dec 29, 2016
90bb3a8
gray effi BG layer added
Nicolasribot Dec 29, 2016
b2f77cc
redraw forced on init
Nicolasribot Dec 29, 2016
87e8ed8
raster added
Nicolasribot Dec 30, 2016
00f8789
server url
Nicolasribot Dec 30, 2016
2d234f0
sample raster
Nicolasribot Dec 30, 2016
b14c3a9
points as shapefile in raster.map
Nicolasribot Dec 30, 2016
e4dffe9
server url
Nicolasribot Dec 30, 2016
5d847e7
raster scripts put here along with data
Nicolasribot Dec 30, 2016
3b5bd16
rasterCtrl leaflet plugin begun
Nicolasribot Dec 30, 2016
a0969fd
jquery UI
Nicolasribot Dec 30, 2016
b15ac2f
new ui components
Nicolasribot Dec 31, 2016
8a535f0
tmp ramp
Nicolasribot Dec 31, 2016
80188b0
server url
Nicolasribot Dec 31, 2016
5924ea3
server url
Nicolasribot Dec 31, 2016
e48ea9d
server url
Nicolasribot Dec 31, 2016
2883d42
new data fontainebleau, presets commented-out
Nicolasribot Jan 1, 2017
14d6e86
server url
Nicolasribot Jan 1, 2017
be61190
stderr redirection for script, platform detection for variables
Nicolasribot Jan 1, 2017
ed71d86
platform detection
Nicolasribot Jan 1, 2017
b1e1d10
gdal 2.1 custom path
Nicolasribot Jan 1, 2017
f60af57
test params
Nicolasribot Jan 1, 2017
451043d
restored params
Nicolasribot Jan 1, 2017
fdcaa43
all gdal_grid methods handled
Nicolasribot Jan 1, 2017
78ea343
disabled form elements
Nicolasribot Jan 1, 2017
5e7ac17
slope ended
Nicolasribot Jan 1, 2017
f2e17e0
get param
Nicolasribot Jan 1, 2017
12fa9c2
revert
Nicolasribot Jan 1, 2017
2a08ccb
server url
Nicolasribot Jan 2, 2017
d3e723a
new dir layout for html-demo
Nicolasribot Jan 2, 2017
a5d029f
price raster
Nicolasribot Jan 3, 2017
d8f092a
terrain generator ui and scripts
Nicolasribot Jan 3, 2017
f8239ac
test
Nicolasribot Jan 3, 2017
608cbfb
zone selection and conf by zone added
Nicolasribot Jan 3, 2017
0d49963
default value changed
Nicolasribot Jan 3, 2017
7ea02cd
color ramp values
Nicolasribot Jan 3, 2017
4f187f7
zones saved
Nicolasribot Jan 3, 2017
0f6dece
terrain page completed for phase 1
Nicolasribot Jan 3, 2017
26d9ec5
icons
Nicolasribot Jan 3, 2017
492e39c
path
Nicolasribot Jan 3, 2017
36bec14
generates vrt on server
Nicolasribot Jan 3, 2017
1ffe581
commented-out vrt
Nicolasribot Jan 3, 2017
902b2a7
grayscale for roads
Nicolasribot Jan 4, 2017
bd28abe
mask for streets
Nicolasribot Jan 4, 2017
bb25e65
test mask
Nicolasribot Jan 4, 2017
5c052e7
mask streets
Nicolasribot Jan 4, 2017
fee8d5e
mask shape
Nicolasribot Jan 4, 2017
89e881f
buildings mask added
Nicolasribot Jan 4, 2017
27e3474
masks
Nicolasribot Jan 4, 2017
229f0f9
no shape generation
Nicolasribot Jan 4, 2017
a261743
mask js
Nicolasribot Jan 4, 2017
f29b558
masks from database
Nicolasribot Jan 4, 2017
ce3fcd2
mask for zones
Nicolasribot Jan 4, 2017
3074846
zone nav added for france
Nicolasribot Jan 5, 2017
54afc70
terrain generator ui and scripts
Nicolasribot Jan 6, 2017
f4bc932
server DEM
Nicolasribot Jan 6, 2017
05e48c9
PG mask added
Nicolasribot Jan 6, 2017
800e509
mask at all levels
Nicolasribot Jan 6, 2017
d4ed6de
pre generated rasters (process_all.bash),
Nicolasribot Jan 6, 2017
43ed8f0
all communes for alsace
Nicolasribot Jan 6, 2017
dab0359
MS heatmap tests
Nicolasribot Jan 8, 2017
713646f
default layer
Nicolasribot Jan 9, 2017
38febcd
B&W as default
Nicolasribot Jan 9, 2017
e979eb6
no more rasterctrl panel
Nicolasribot Jan 9, 2017
d823145
new layer with geocoded only
Nicolasribot Jan 9, 2017
40bbf61
resampled tif with jpeg compression
Nicolasribot Jan 9, 2017
f99b1f2
labels layer
Nicolasribot Jan 9, 2017
795c736
bad url for street.php
Nicolasribot Jan 10, 2017
3326372
Merge remote-tracking branch 'origin/master'
Nicolasribot Jan 10, 2017
87b14fc
vec street under labels
Nicolasribot Jan 10, 2017
5191156
dynamic transparency for raster layers: 0.5 at big zooms
Nicolasribot Jan 10, 2017
2569ce3
new transparency to test
Nicolasribot Jan 10, 2017
6e6e7cc
layer opacity controls restored (other components hidden)
Nicolasribot Jan 10, 2017
ab95486
cursor management at zoom 16 and 17
Nicolasribot Jan 10, 2017
71d07d1
no more sliders for transp
Nicolasribot Jan 10, 2017
5ca7035
new layers names and order in layer control
Nicolasribot Jan 11, 2017
e0a9136
effi paris work
Nicolasribot Jan 14, 2017
023887e
cleanup old methods tests
Nicolasribot Jan 14, 2017
3048ba1
Merge branch 'master' of https://github.com/Nicolasribot/basemaps
Nicolasribot Jan 14, 2017
0f51a3b
cleanup private test code
Nicolasribot Jan 19, 2017
f2efa72
end symbols for effi
Nicolasribot Jan 19, 2017
142e53d
server cache
Nicolasribot Jan 19, 2017
45ab0a8
all metros and server db user
Nicolasribot Jan 19, 2017
d758b9c
new icons
Nicolasribot Jan 19, 2017
b9730a6
global commit
Nicolasribot Feb 26, 2017
69a5fca
new singleTile layers for ms
Nicolasribot Feb 26, 2017
1cedbed
new style for grayscale, no labels
Nicolasribot Mar 20, 2017
2963182
server port
Nicolasribot Mar 20, 2017
e95904a
bad port
Nicolasribot Mar 20, 2017
74a0b8a
db user
Nicolasribot Mar 20, 2017
4d0d033
server conf + new google-no-labels-grayscale tileset
Nicolasribot Mar 20, 2017
8d8fe5a
source corrected for new tileset
Nicolasribot Mar 20, 2017
13f8ac4
new S3 layer for Google no labels grayscale style
Nicolasribot Mar 22, 2017
372418c
new S3 layer and custom outputformat to force max compression for PNG
Nicolasribot Mar 22, 2017
a4d50bc
missing icon
Nicolasribot Apr 5, 2017
e90c35a
missing icon
Nicolasribot Apr 6, 2017
c46b588
new layers to test server mapserver for symbols only
Nicolasribot Apr 10, 2017
4d3803c
set disk cache for osm-symbols-only to test coverage
Nicolasribot Apr 10, 2017
4903ae7
missing icons
Nicolasribot Apr 13, 2017
5c20790
missing icons
Nicolasribot Apr 13, 2017
bf461e7
disk cache for grayscale to generate locally
Nicolasribot Apr 18, 2017
4266018
corrected grayscale style that forced disable buildings
Nicolasribot Apr 28, 2017
a1f5f5c
new imposm3 mapping and conf to reload only parks into landusages tables
Nicolasribot Apr 28, 2017
4a71aa2
data_big is the folder for the cache
Nicolasribot Apr 28, 2017
6da2195
NEW grayscale tileset
Nicolasribot Apr 28, 2017
d590599
new S3 cache valid parameters for retry...
Nicolasribot Apr 29, 2017
d5e7917
retry and retry-delay added to source also
Nicolasribot Apr 29, 2017
c7230b2
512 grid for grayscale...
Nicolasribot May 1, 2017
cb75b8d
512 S3 url for grayscale...
Nicolasribot May 1, 2017
4c1c49e
smaller metatiles: 4x4
Nicolasribot May 1, 2017
a25efe4
restored 8x8 metatiles: should increase maximage
Nicolasribot May 1, 2017
5ef3421
DROM work: new html demo with zones, conf for AWS server
Nicolasribot Jul 20, 2017
14c6464
server conf
Nicolasribot Jul 20, 2017
58ac930
new leaflet plugins
Nicolasribot Jul 20, 2017
b96f01c
added missing DROM
Nicolasribot Jul 20, 2017
f30f1a6
server conf
Nicolasribot Jul 20, 2017
7c48d64
server conf
Nicolasribot Jul 20, 2017
7f16db9
cleanup: test work moved elsewhere
Nicolasribot Nov 4, 2017
d7f511e
cleanup: test work moved elsewhere
Nicolasribot Nov 4, 2017
dc1a4e4
current work
Nicolasribot Nov 2, 2018
2f9d113
reverted to default osmbase.map template
Nicolasribot Nov 2, 2018
fdcfa42
PI PG connection settings
Nicolasribot Nov 2, 2018
987f1a0
disabled relief conf
Nicolasribot Nov 2, 2018
e9d9574
disabled relief conf
Nicolasribot Nov 2, 2018
4eeec68
removed relief include
Nicolasribot Nov 2, 2018
7421253
forced active_schema to be import, time for index to finish on this s…
Nicolasribot Nov 2, 2018
f9a17da
reverted to default pg con
Nicolasribot Nov 2, 2018
1796875
old work
Nicolasribot Dec 20, 2021
9f7e6f6
old work to establish new styles.
Nicolasribot Feb 2, 2022
aef7cf0
theirs
Nicolasribot Feb 2, 2022
a88c1f1
a new style supporting symbols, based on OSM symbols
Nicolasribot Feb 4, 2022
808fd69
not needed anymore
Nicolasribot Feb 4, 2022
6403ebd
added some doc to readme, makefile managing the post-symbol sql file
Nicolasribot Feb 4, 2022
68488b7
added some doc to readme, makefile managing the post-symbol sql file
Nicolasribot Feb 7, 2022
4d733e8
[refactor] homogenized template map file indentation
andreassteffens Apr 28, 2022
95e78c1
[fix] added missing projection and extent information to speed up gen…
andreassteffens Apr 28, 2022
0d16e4f
[refactor] homogenized template map file indentation
andreassteffens Apr 28, 2022
48a7378
[feat] added new housenumbers style
andreassteffens Apr 28, 2022
9cbb69d
Merge pull request #3 from andreassteffens/master
Nicolasribot Apr 28, 2022
bf065be
[refactor] homogenized template map file indentation
andreassteffens Apr 29, 2022
b134c5b
[fix] added files 'post-symbols.sql' and 'boundaries.sql' to Makefile…
andreassteffens Apr 29, 2022
31392ff
[fix] removed superfluous SQL statements
andreassteffens Apr 29, 2022
5bc5804
[fix] added missing OSM_PREFIX placeholder to SQL statement
andreassteffens Apr 29, 2022
0715b7b
[feat] optimized rendering speed of symbol layers by creating additio…
andreassteffens May 1, 2022
7729b4e
Merge pull request #4 from andreassteffens/master
Nicolasribot May 1, 2022
3d0427c
[feat] modified imposm import mapping to include address information …
andreassteffens May 2, 2022
bc1a865
[fix] removed faulty variable in Google style affecting building visi…
andreassteffens May 3, 2022
3efe68c
Merge pull request #5 from andreassteffens/master
Nicolasribot May 3, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ STYLE?=default
template=osmbase.map

includes=land.map landusage.map borders.map highways.map places.map \
symbols-aeroways.map symbols-amenities.map symbols-stations.map \
generated/$(STYLE)style.msinc \
generated/$(STYLE)level0.msinc generated/$(STYLE)level1.msinc generated/$(STYLE)level2.msinc generated/$(STYLE)level3.msinc \
generated/$(STYLE)level4.msinc generated/$(STYLE)level5.msinc generated/$(STYLE)level6.msinc generated/$(STYLE)level7.msinc \
Expand All @@ -41,7 +42,7 @@ includes=land.map landusage.map borders.map highways.map places.map \

mapfile=osm-$(STYLE).map

all:$(mapfile) boundaries.sql
all:$(mapfile) boundaries.sql post-symbols.sql

generated/$(STYLE)style.msinc: generate_style.py
python generate_style.py -s $(STYLE) -g > $@
Expand Down Expand Up @@ -119,6 +120,10 @@ boundaries.sql: boundaries.sql.in
cp -f $< $@
$(SED) -e 's/OSM_PREFIX_/$(OSM_PREFIX)/g' $@

post-symbols.sql: post-symbols.sql.in
cp -f $< $@
$(SED) -e 's/OSM_PREFIX_/$(OSM_PREFIX)/g' $@

clean:
rm -f generated/*

Expand Down
85 changes: 84 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,88 @@
"bingosm2pgsql":"default,outlined,bing,osm2pgsql" then run `make STYLE=bingosm2pgsql` to create the osm-bingosm2pgsql.map

- Most configuration and tweaks should be done in generate_style.py.
documentation as to how to edit can be fount at
documentation as to how to edit can be found at
https://mapserver.org/basemaps/style.html.

# Available styles
## default style
zoom 10

![default style, zoom 10](style-default-z10.png)

zoom 14

![default style, zoom 14](style-default-z14.png)

## google style
zoom 10

![google style, zoom 10](style-google-z10.png)

zoom 14

![google style, zoom 14](style-google-z14.png)

## bing style
zoom 10

![bing style, zoom 10](style-bing-z10.png)

zoom 14

![bing style, zoom 14](style-bing-z14.png)

## michelin style
zoom 10

![michelin style, zoom 10](style-michelin-z10.png)

zoom 14

![michelin style, zoom 14](style-michelin-z14.png)

## bw style
zoom 10

![bw style, zoom 10](style-bw-z10.png)

zoom 14

![bw style, zoom 14](style-bw-z14.png)

## Symbol style
To produce a mapfile displaying symbols, load OSM data with imposm3 using the file `imposm3-mapping-symbols.json` as mapping file

After OSM data is loaded, run post-symbols.sql to create some indexes that will speed-up queries.
(this file should be built with make command)

The following style aliases based on symbol style are defined:
- defaultsymbols
- googlesymbols
- bingsymbols
- michelinsymbols

### default vs defaultsymbols styles


zoom 15

![dzoom 15](style-default-z15.png)
![dszoom 15](style-defaultsymbols-z15.png)

zoom 16

![szoom 16](style-default-z16.png)
![dszoom 16](style-defaultsymbols-z16.png)

zoom 17

![dzoom 17](style-default-z17.png)
![dszoom 17](style-defaultsymbols-z17.png)

zoom 18

![dzoom 18](style-default-z18.png)
![dszoom 18](style-defaultsymbols-z18.png)


5 changes: 2 additions & 3 deletions borders.map
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ LAYER
END
END
#endif
#if _display_border_8 == 1
#if _display_border_8 == 1
CLASS
EXPRESSION "8"
#if _display_border_8_outer == 1
Expand All @@ -94,5 +94,4 @@ LAYER
END
END
#endif
END

END
7 changes: 7 additions & 0 deletions fonts.lst
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,10 @@ khmer fonts/KhmerOS.ttf
jp fonts/ipag.ttf
#sc fonts/Cyberbit.ttf
#scb fonts/Cyberbit.ttf

# for symbols/POI names:
NotoSansUIBold fonts/NotoSansUI-Bold.ttf
NotoSansUIRegular fonts/NotoSansUI-Regular.ttf
NotoSansSymbolsRegular fonts/NotoSansSymbols-Regular.ttf
NotoEmojiRegular fonts/NotoEmoji-Regular.ttf
DejaVuSansBook fonts/DejaVuSans.ttf
Binary file added fonts/DejaVuSans.ttf
Binary file not shown.
Binary file added fonts/NotoEmoji-Regular.ttf
Binary file not shown.
Binary file added fonts/NotoSansCJKjp-Regular.otf
Binary file not shown.
Binary file added fonts/NotoSansSymbols-Regular.ttf
Binary file not shown.
Binary file added fonts/NotoSansUI-Bold.ttf
Binary file not shown.
Binary file added fonts/NotoSansUI-Regular.ttf
Binary file not shown.
Loading