Skip to content
Snippets Groups Projects
Commit 43a24405 authored by David Hoese's avatar David Hoese
Browse files

Merge branch 'bugfix-overlay-resolutions' into 'master' 

Update overlay resolutions and switching points

Closes #22 and #36

See merge request cspp_geo/cspp-geo-web-viewer!38
parents 07d155ac a66445b7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
mapserver/mapfiles/basemap.map
+ 2
− 4
View file @ 43a24405
......@@ -63,7 +63,7 @@ MAP
"wms_title" "m10_states"
END
MINSCALEDENOM 1
MAXSCALEDENOM 150000000
MAXSCALEDENOM 7500000
OFFSITE 128 128 128
CLASS
NAME '10m_states'
......@@ -88,7 +88,6 @@ MAP
"wms_title" "m10_lakes"
END
MINSCALEDENOM 1
#MAXSCALEDENOM 37500000
MAXSCALEDENOM 375000
OFFSITE 128 128 128
CLASS
......@@ -118,8 +117,7 @@ MAP
"wms_title" "cb_2018_us_county_500k"
END
MINSCALEDENOM 1
#MAXSCALEDENOM 5000000
MAXSCALEDENOM 200000
MAXSCALEDENOM 1250000
OFFSITE 128 128 128
CLASS
NAME 'cb_2018_us_county_500k'
......
mapserver/mapfiles/borders.map
+ 3
− 4
View file @ 43a24405
......@@ -66,7 +66,7 @@ MAP
"wms_title" "m10_states"
END
MINSCALEDENOM 1
MAXSCALEDENOM 150000000
MAXSCALEDENOM 7500000
OFFSITE 128 128 128
CLASS
NAME '10m_states'
......@@ -94,8 +94,8 @@ MAP
METADATA
"wms_title" "m10_lakes"
END
# Lakes show up at zoom levels ~5 and 6
MINSCALEDENOM 1
#MAXSCALEDENOM 37500000
MAXSCALEDENOM 3750000
OFFSITE 128 128 128
CLASS
......@@ -128,8 +128,7 @@ MAP
"wms_title" "cb_2018_us_county_500k"
END
MINSCALEDENOM 1
#MAXSCALEDENOM 5000000
MAXSCALEDENOM 200000
MAXSCALEDENOM 1250000
OFFSITE 128 128 128
CLASS
NAME 'cb_2018_us_county_500k'
......
mapserver/mapfiles/graticules.map
+ 8
− 8
View file @ 43a24405
......@@ -37,7 +37,7 @@ MAP
"wms_title" "10m resolution 1 degree grid"
END
MINSCALEDENOM 1
MAXSCALEDENOM 5000000
MAXSCALEDENOM 1250000
OFFSITE 127 127 127
CLASS
NAME '1degree_grid'
......@@ -53,7 +53,7 @@ MAP
COLOR 255 255 255
OUTLINECOLOR 0 0 0
MINSCALEDENOM 1
MAXSCALEDENOM 5000000
MAXSCALEDENOM 1250000
END
STYLE
PATTERN 16 16 END
......@@ -81,8 +81,8 @@ MAP
METADATA
"wms_title" "10m resolution 5 degree grid"
END
MINSCALEDENOM 5000000
MAXSCALEDENOM 50000000
MINSCALEDENOM 1250000
MAXSCALEDENOM 4000000
OFFSITE 127 127 127
CLASS
NAME '5degree_grid'
......@@ -97,8 +97,8 @@ MAP
MINDISTANCE 1024
COLOR 255 255 255
OUTLINECOLOR 0 0 0
MINSCALEDENOM 5000000
MAXSCALEDENOM 50000000
MINSCALEDENOM 1250000
MAXSCALEDENOM 4000000
END
STYLE
PATTERN 32 32 END
......@@ -126,7 +126,7 @@ MAP
METADATA
"wms_title" "10m resolution 10 degree grid"
END
MINSCALEDENOM 50000000
MINSCALEDENOM 4000000
MAXSCALEDENOM 11000000000
OFFSITE 127 127 127
CLASS
......@@ -142,7 +142,7 @@ MAP
MINDISTANCE 1024
COLOR 255 255 255
OUTLINECOLOR 0 0 0
MINSCALEDENOM 50000000
MINSCALEDENOM 4000000
MAXSCALEDENOM 11000000000
END
STYLE
......
mapserver/mapfiles/overlays.map deleted 100644 → 0
+ 0
− 280
View file @ 07d155ac
MAP
NAME "Map Overlays"
STATUS ON
MAXSIZE 5000
SIZE 1024 1024
IMAGECOLOR 128 128 128
IMAGETYPE rgba
EXTENT -5434894.885 -5434894.885 5434894.885 5434894.885
FONTSET "/work/mapfiles/fonts.list"
PROJECTION
"init=epsg:930916"
END
WEB
METADATA
"wms_title" "Overlays"
INCLUDE "/work/mapfiles/generic_metadata.map"
END
END
INCLUDE '/work/mapfiles/output_formats.map'
LAYER
NAME "m10_countries"
DATA /work/shapefiles/ne_10m_admin_0_countries
EXTENT -180 -89.9998 180 83.6338
STATUS ON
TYPE POLYGON
PROJECTION
"init=epsg:4326"
END
GROUP bw_map
METADATA
"wms_title" "m10_countries"
END
MINSCALEDENOM 1
MAXSCALEDENOM 11000000000
OFFSITE 128 128 128
CLASS
NAME '10m_countries'
STYLE
WIDTH 2
OUTLINECOLOR 0 0 0
END
STYLE
WIDTH 1
OUTLINECOLOR 255 255 255
END
END
END
LAYER
NAME "m10_states"
DATA /work/shapefiles/ne_10m_admin_1_states_provinces_lines
EXTENT -139.047 -49.2507 178.449 81.1382
STATUS ON
# don't show this for some countries to avoid conflicting lines between layers
FILTER (("[adm0_name]" == "Australia") OR ("[adm0_name]" == "Canada") OR ("[adm0_name]" == "United States of America"))
TYPE LINE
PROJECTION
"init=epsg:4326"
END
GROUP bw_map
METADATA
"wms_title" "m10_states"
END
MINSCALEDENOM 1
MAXSCALEDENOM 150000000
OFFSITE 128 128 128
CLASS
NAME '10m_states'
STYLE
WIDTH 2
COLOR 0 0 0
END
STYLE
WIDTH 1
COLOR 255 255 255
END
END
END
LAYER
NAME "m10_lakes"
DATA /work/shapefiles/ne_10m_lakes
EXTENT -165.966 -50.6696 176.094 81.9553
STATUS ON
TYPE POLYGON
PROJECTION
"init=epsg:4326"
END
GROUP bw_map
METADATA
"wms_title" "m10_lakes"
END
MINSCALEDENOM 1
#MAXSCALEDENOM 37500000
MAXSCALEDENOM 3750000
OFFSITE 128 128 128
CLASS
NAME '10m_lakes'
STYLE
WIDTH 2
OUTLINECOLOR 0 0 0
END
STYLE
WIDTH 1
OUTLINECOLOR 255 255 255
END
END
END
LAYER
NAME "cb_2018_us_county_500k"
DATA /work/shapefiles/cb_2018_us_county_500k
EXTENT -179.147 -14.5487 179.778 71.3526
# Limit to 50 states based on FIPS codes (exclude Hawaii)
FILTER ("[STATEFP]" <= "56" AND "[STATEFP]" != "03" AND "[STATEFP]" != "7" AND "[STATEFP]" != "14" AND "[STATEFP]" != "43" AND "[STATEFP]" != "52" AND "[STATEFP]" != "15")
STATUS ON
TYPE POLYGON
PROJECTION
"init=epsg:4269"
END
GROUP bw_map
METADATA
"wms_title" "cb_2018_us_county_500k"
END
MINSCALEDENOM 1
#MAXSCALEDENOM 5000000
MAXSCALEDENOM 200000
OFFSITE 128 128 128
CLASS
NAME 'cb_2018_us_county_500k'
STYLE
WIDTH 2
OUTLINECOLOR 0 0 0
END
STYLE
WIDTH 1
OUTLINECOLOR 255 255 255
END
END
END
# Graticule Lines
LAYER
NAME "1degree_grid"
DATA /work/shapefiles/ne_10m_graticules_1
EXTENT -180 -90 180 90
STATUS ON
TYPE LINE
PROJECTION
"init=epsg:4326"
END
GROUP latlongrid
METADATA
"wms_title" "10m resolution 1 degree grid"
END
MINSCALEDENOM 1
MAXSCALEDENOM 5000000
OFFSITE 127 127 127
CLASS
NAME '1degree_grid'
TEXT '[degrees]°'
LABEL
TYPE TRUETYPE
FONT arial
SIZE 10
FORCE FALSE
PARTIALS FALSE
POSITION AUTO
MINDISTANCE 1024
COLOR 255 255 255
OUTLINECOLOR 0 0 0
MINSCALEDENOM 1
MAXSCALEDENOM 5000000
END
STYLE
PATTERN 16 16 END
WIDTH 2
COLOR 0 0 0
END
STYLE
PATTERN 16 16 END
WIDTH 1
COLOR 255 255 255
END
END
END
LAYER
NAME "5degree_grid"
DATA /work/shapefiles/ne_10m_graticules_5
EXTENT -180 -90 180 90
STATUS ON
TYPE LINE
PROJECTION
"init=epsg:4326"
END
GROUP latlongrid
METADATA
"wms_title" "10m resolution 5 degree grid"
END
MINSCALEDENOM 5000000
MAXSCALEDENOM 50000000
OFFSITE 127 127 127
CLASS
NAME '5degree_grid'
TEXT '[degrees]°'
LABEL
TYPE TRUETYPE
FONT arial
SIZE 10
FORCE FALSE
PARTIALS FALSE
POSITION AUTO
MINDISTANCE 1024
COLOR 255 255 255
OUTLINECOLOR 0 0 0
MINSCALEDENOM 5000000
MAXSCALEDENOM 50000000
END
STYLE
PATTERN 32 32 END
WIDTH 2
COLOR 0 0 0
END
STYLE
PATTERN 32 32 END
WIDTH 1
COLOR 255 255 255
END
END
END
LAYER
NAME "10degree_grid"
DATA /work/shapefiles/ne_10m_graticules_10
EXTENT -180 -90 180 90
STATUS ON
TYPE LINE
PROJECTION
"init=epsg:4326"
END
GROUP latlongrid
METADATA
"wms_title" "10m resolution 10 degree grid"
END
MINSCALEDENOM 50000000
MAXSCALEDENOM 11000000000
OFFSITE 127 127 127
CLASS
NAME '10degree_grid'
TEXT '[degrees]°'
LABEL
TYPE TRUETYPE
FONT arial
SIZE 10
FORCE FALSE
PARTIALS FALSE
POSITION AUTO
MINDISTANCE 1024
COLOR 255 255 255
OUTLINECOLOR 0 0 0
MINSCALEDENOM 50000000
MAXSCALEDENOM 11000000000
END
STYLE
WIDTH 2
COLOR 0 0 0
END
STYLE
WIDTH 1
COLOR 255 255 255
END
END
END
END
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment