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

Merge upstream 2.40.0 changes #5

Closed
wants to merge 20 commits into from
+294 −192
Closed

Merge upstream 2.40.0 changes #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3eaf7c4
Reformat road SQL
pnorman Feb 17, 2016
1710ea6
placenames-medium is not used on z3
matkoniecz Jun 17, 2016
7b0ea93
Merge pull request #2168 from pnorman/road_reformat
matkoniecz Jun 17, 2016
7b492e6
Revert "Merge remote-tracking branch 'pnorman/water_polygons'"
matthijsmelissen Jun 18, 2016
723b869
Merge pull request #2173 from matkoniecz/faster_z3
matthijsmelissen Jun 18, 2016
77b3010
rewrite low priority layer to make it like main amenity layer
matkoniecz Jun 17, 2016
2af08b0
stop displaying highway=mini_roundabout and highway=level_crossing ma…
matkoniecz Jun 18, 2016
cb69b80
larger labels for placenames
matkoniecz Jun 18, 2016
eb5f783
Filter placenames-large based on way_area
pnorman Jun 21, 2016
c573c8d
Add name IS NOT NULL check to medium placenames
pnorman Jun 21, 2016
d34fe46
Merge pull request #2181 from matkoniecz/placename_without_dots
pnorman Jun 21, 2016
0975e13
Merge pull request #2186 from pnorman/placenames_medium_name
matkoniecz Jun 21, 2016
e2ab3a1
synchronise description in Github repo and project file
matkoniecz Jun 21, 2016
d789bda
Merge pull request #2188 from matkoniecz/synch
matthijsmelissen Jun 21, 2016
dbb4d94
it is not necessary to query buildings for z12, as buildings are not …
matkoniecz Jun 21, 2016
7f5624d
Merge pull request #2190 from matkoniecz/buildingless_z12
matthijsmelissen Jun 21, 2016
e7dc874
Merge pull request #2185 from pnorman/placename_large_way_area
matthijsmelissen Jun 21, 2016
51da5e2
show bus_guideway tunnels
matkoniecz Jun 21, 2016
2e3802c
Merge pull request #2191 from matkoniecz/show_guideway_tunnel
matthijsmelissen Jun 21, 2016
f995a5e
Merge tag 'v2.40.0' into de_2.40.0_update
pnorman Jul 2, 2016
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ node_js:
- "0.10"
install:
- npm install [email protected]
- mkdir -p data/world_boundaries data/simplified-land-polygons-complete-3857 data/simplified-water-polygons-complete-3857 data/ne_110m_admin_0_boundary_lines_land data/ne_10m_populated_places data/water-polygons-split-3857
- touch data/world_boundaries/builtup_area.shp data/simplified-water-polygons-complete-3857/simplified_water_polygons.shp data/ne_110m_admin_0_boundary_lines_land/ne_110m_admin_0_boundary_lines_land.shp data/ne_10m_populated_places/ne_10m_populated_places_fixed.shp data/water-polygons-split-3857/water_polygons.shp
- mkdir -p data/world_boundaries data/simplified-land-polygons-complete-3857 data/ne_110m_admin_0_boundary_lines_land data/ne_10m_populated_places data/land-polygons-split-3857
- touch data/world_boundaries/builtup_area.shp data/simplified-land-polygons-complete-3857/simplified_land_polygons.shp data/ne_110m_admin_0_boundary_lines_land/ne_110m_admin_0_boundary_lines_land.shp data/ne_10m_populated_places/ne_10m_populated_places_fixed.shp data/land-polygons-split-3857/land_polygons.shp
script:
- jsonlint project.mml
- ./node_modules/carto/bin/carto project.mml | xmllint - | wc -l
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ To download the shapefiles you can run the following script from this directory.

You can also download them manually at the following paths:

* [`simplified-water-polygons.shp`](http://data.openstreetmapdata.com/simplified-water-polygons-complete-3857.zip) (updated daily)
* [`water-polygon.shp`](http://data.openstreetmapdata.com/water-polygons-split-3857.zip) (updated daily)
* [`simplified-land-polygons.shp`](http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip) (updated daily)
* [`land-polygon.shp`](http://data.openstreetmapdata.com/land-polygons-split-3857.zip) (updated daily)
* [`builtup_area.shp`](http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz)
* [`ne_110m_admin_0_boundary_lines_land.shp`](http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip)

Expand Down
34 changes: 17 additions & 17 deletions amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,24 +1042,24 @@
}

.amenity-low-priority {
[man_made = 'cross'][zoom >= 16],
[historic = 'wayside_cross'][zoom >= 16] {
[feature = 'man_made_cross'][zoom >= 16],
[feature = 'historic_wayside_cross'][zoom >= 16] {
marker-file: url('symbols/christian.9.svg');
marker-fill: #000000;
marker-placement: interior;
marker-clip: false;
}

[amenity = 'parking'][zoom >= 17],
[amenity = 'bicycle_parking'][zoom >= 17],
[amenity = 'motorcycle_parking'][zoom >= 17] {
[amenity = 'parking'] {
[feature = 'amenity_parking'][zoom >= 17],
[feature = 'amenity_bicycle_parking'][zoom >= 17],
[feature = 'amenity_motorcycle_parking'][zoom >= 17] {
[feature = 'amenity_parking'] {
marker-file: url('symbols/parking.svg');
}
[amenity = 'bicycle_parking'] {
[feature = 'amenity_bicycle_parking'] {
marker-file: url('symbols/bicycle_parking.16.svg');
}
[amenity = 'motorcycle_parking'] {
[feature = 'amenity_motorcycle_parking'] {
marker-file: url('symbols/motorcycle_parking.16.svg');
}
marker-placement: interior;
Expand All @@ -1070,38 +1070,38 @@
}
}

[railway = 'level_crossing'][zoom >= 14]::railway {
[feature = 'railway_level_crossing'][zoom >= 14]::railway {
point-file: url('symbols/level_crossing.svg');
point-placement: interior;
[zoom >= 16] {
point-file: url('symbols/level_crossing2.svg');
}
}

[highway = 'mini_roundabout'][zoom >= 16]::highway {
[feature = 'highway_mini_roundabout'][zoom >= 16]::highway {
marker-file: url('symbols/mini_roundabout.svg');
marker-placement: interior;
marker-clip: false;
}

[barrier = 'gate']::barrier {
[feature = 'barrier_gate']::barrier {
[zoom >= 16] {
marker-file: url('symbols/gate.svg');
marker-placement: interior;
marker-clip: false;
}
}

[barrier = 'lift_gate'][zoom >= 16]::barrier,
[barrier = 'swing_gate'][zoom >= 16]::barrier {
[feature = 'barrier_lift_gate'][zoom >= 16]::barrier,
[feature = 'barrier_swing_gate'][zoom >= 16]::barrier {
marker-file: url('symbols/liftgate.svg');
marker-fill: #3f3f3f;
marker-placement: interior;
marker-clip: false;
}

[barrier = 'bollard'],
[barrier = 'block'] {
[feature = 'barrier_bollard'],
[feature = 'barrier_block'] {
[zoom >= 16] {
marker-width: 3;
marker-line-width: 0;
Expand All @@ -1114,13 +1114,13 @@
}
}

[amenity = 'bench'][zoom >= 19]::amenity {
[feature = 'amenity_bench'][zoom >= 19]::amenity {
marker-file: url('symbols/bench.16.svg');
marker-fill: @amenity-brown;
marker-placement: interior;
}

[amenity = 'waste_basket'][zoom >= 19]::amenity {
[feature = 'amenity_waste_basket'][zoom >= 19]::amenity {
marker-file: url('symbols/waste_basket.10.svg');
marker-fill: @amenity-brown;
marker-placement: interior;
Expand Down
48 changes: 24 additions & 24 deletions get-shapefiles.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@ UNZIP_OPTS=-qqun
# create and populate data dir
mkdir -p data/
mkdir -p data/world_boundaries
mkdir -p data/simplified-water-polygons-complete-3857
mkdir -p data/simplified-land-polygons-complete-3857
mkdir -p data/ne_110m_admin_0_boundary_lines_land
mkdir -p data/water-polygons-split-3857
mkdir -p data/land-polygons-split-3857

# world_boundaries
echo "downloading world_boundaries..."
curl -z "data/world_boundaries-spherical.tgz" -L -o "data/world_boundaries-spherical.tgz" "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"
echo "expanding world_boundaries..."
tar -xzf data/world_boundaries-spherical.tgz -C data/

# simplified-water-polygons-complete-3857
echo "downloading simplified-water-polygons-complete-3857..."
curl -z "data/simplified-water-polygons-complete-3857.zip" -L -o "data/simplified-water-polygons-complete-3857.zip" "http://data.openstreetmapdata.com/simplified-water-polygons-complete-3857.zip"
echo "simplified-water-polygons-complete-3857..."
unzip $UNZIP_OPTS data/simplified-water-polygons-complete-3857.zip \
simplified-water-polygons-complete-3857/simplified_water_polygons.shp \
simplified-water-polygons-complete-3857/simplified_water_polygons.shx \
simplified-water-polygons-complete-3857/simplified_water_polygons.prj \
simplified-water-polygons-complete-3857/simplified_water_polygons.dbf \
simplified-water-polygons-complete-3857/simplified_water_polygons.cpg \
# simplified-land-polygons-complete-3857
echo "downloading simplified-land-polygons-complete-3857..."
curl -z "data/simplified-land-polygons-complete-3857.zip" -L -o "data/simplified-land-polygons-complete-3857.zip" "http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip"
echo "simplified-land-polygons-complete-3857..."
unzip $UNZIP_OPTS data/simplified-land-polygons-complete-3857.zip \
simplified-land-polygons-complete-3857/simplified_land_polygons.shp \
simplified-land-polygons-complete-3857/simplified_land_polygons.shx \
simplified-land-polygons-complete-3857/simplified_land_polygons.prj \
simplified-land-polygons-complete-3857/simplified_land_polygons.dbf \
simplified-land-polygons-complete-3857/simplified_land_polygons.cpg \
-d data/

# ne_110m_admin_0_boundary_lines_land
Expand All @@ -39,16 +39,16 @@ unzip $UNZIP_OPTS data/ne_110m_admin_0_boundary_lines_land.zip \
ne_110m_admin_0_boundary_lines_land.dbf \
-d data/ne_110m_admin_0_boundary_lines_land/

# water-polygons-split-3857
echo "downloading water-polygons-split-3857..."
curl -z "data/water-polygons-split-3857.zip" -L -o "data/water-polygons-split-3857.zip" "http://data.openstreetmapdata.com/water-polygons-split-3857.zip"
echo "expanding water-polygons-split-3857..."
unzip $UNZIP_OPTS data/water-polygons-split-3857.zip \
water-polygons-split-3857/water_polygons.shp \
water-polygons-split-3857/water_polygons.shx \
water-polygons-split-3857/water_polygons.prj \
water-polygons-split-3857/water_polygons.dbf \
water-polygons-split-3857/water_polygons.cpg \
# land-polygons-split-3857
echo "downloading land-polygons-split-3857..."
curl -z "data/land-polygons-split-3857.zip" -L -o "data/land-polygons-split-3857.zip" "http://data.openstreetmapdata.com/land-polygons-split-3857.zip"
echo "expanding land-polygons-split-3857..."
unzip $UNZIP_OPTS data/land-polygons-split-3857.zip \
land-polygons-split-3857/land_polygons.shp \
land-polygons-split-3857/land_polygons.shx \
land-polygons-split-3857/land_polygons.prj \
land-polygons-split-3857/land_polygons.dbf \
land-polygons-split-3857/land_polygons.cpg \
-d data/

# antarctica-icesheet-polygons-3857
Expand Down Expand Up @@ -76,8 +76,8 @@ unzip $UNZIP_OPTS data/antarctica-icesheet-outlines-3857.zip \
#index
echo "indexing shapefiles"
shapeindex --shape_files \
data/simplified-water-polygons-complete-3857/simplified_water_polygons.shp \
data/water-polygons-split-3857/water_polygons.shp \
data/simplified-land-polygons-complete-3857/simplified_land_polygons.shp \
data/land-polygons-split-3857/land_polygons.shp \
data/antarctica-icesheet-polygons-3857/icesheet_polygons.shp \
data/antarctica-icesheet-outlines-3857/icesheet_outlines.shp \
data/ne_110m_admin_0_boundary_lines_land/ne_110m_admin_0_boundary_lines_land.shp
Expand Down
18 changes: 13 additions & 5 deletions placenames.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,29 @@
[zoom >= 4][score >= 3000000],
[zoom >= 5][score >= 400000] {
text-name: "[name]";
text-size: 8;
text-size: 11;
text-fill: @placenames;
text-face-name: @book-fonts;
text-halo-radius: 1.5;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 30;
text-min-distance: 10;
[zoom >= 5] {
text-size: 10;
text-size: 11;
text-wrap-width: 45;
}
[zoom >= 6] {
text-size: 12;
text-wrap-width: 60;
}
[zoom >= 8] {
text-size: 13;
text-wrap-width: 60;
}
[zoom >= 9] {
text-size: 14;
text-wrap-width: 65;
}
[zoom >= 11] {
text-size: 15;
text-wrap-width: 75;
Expand All @@ -94,15 +102,15 @@
[zoom >= 6][score >= 70000],
[zoom >= 7] {
text-name: "[name]";
text-size: 9;
text-size: 10;
text-fill: @placenames;
text-face-name: @book-fonts;
text-halo-radius: 1.5;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 30;
text-min-distance: 10;
[zoom >= 9] {
text-size: 11;
text-size: 12;
text-wrap-width: 60;
}
[zoom >= 11] {
Expand All @@ -121,7 +129,7 @@
[category = 2] {
[zoom >= 9][zoom < 16] {
text-name: "[name]";
text-size: 9;
text-size: 10;
text-fill: @placenames;
text-face-name: @book-fonts;
text-halo-radius: 1.5;
Expand Down
Loading