diff --git a/mapserver/Dockerfile b/mapserver/Dockerfile
index 75d218c700991b6f5bc99f3af66bc90981619310..63fb289ff02ecbe57fd1c94b17cb6a50362ddece 100644
--- a/mapserver/Dockerfile
+++ b/mapserver/Dockerfile
@@ -47,6 +47,35 @@ RUN cd /build_deps && apt-get -y install apache2 libapache2-mod-fcgid && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
+RUN apt-get -y update && apt-get install -y unzip \
+ && curl -LOk https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_admin_0_countries.zip \
+ && curl -LOk https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_admin_1_states_provinces_lines.zip \
+ && curl -LOk https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/physical/ne_10m_lakes.zip \
+ && curl -LOk https://www2.census.gov/geo/tiger/GENZ2018/shp/cb_2018_us_county_500k.zip \
+ && curl -LOk https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/physical/ne_10m_graticules_1.zip \
+ && curl -LOk https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/physical/ne_10m_graticules_5.zip \
+ && curl -LOk https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/physical/ne_10m_graticules_10.zip \
+ && mkdir -p /work/shapefiles \
+ && unzip -d /work/shapefiles ne_10m_admin_0_countries.zip \
+ && unzip -d /work/shapefiles ne_10m_admin_1_states_provinces_lines.zip \
+ && unzip -d /work/shapefiles ne_10m_lakes.zip \
+ && unzip -d /work/shapefiles cb_2018_us_county_500k.zip \
+ && unzip -d /work/shapefiles ne_10m_graticules_1.zip \
+ && unzip -d /work/shapefiles ne_10m_graticules_5.zip \
+ && unzip -d /work/shapefiles ne_10m_graticules_10.zip \
+ && chmod a+r /work/shapefiles/* \
+ && rm -f ne_*.zip cb_*.zip \
+ && apt-get -y clean \
+ && rm -rf /var/lib/apt/lists/*
+
+# Install Fonts for mapserver labels
+RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections \
+ && mkdir -p /work/mapfiles \
+ && apt-get -y update && apt-get install -y ttf-mscorefonts-installer \
+ && bash -c 'for font_fn in `find /usr/share/fonts/truetype/ -name "*.ttf"`; do font_name=`basename $font_fn`; font_name=${font_name/.ttf/}; font_name=${font_name,,}; echo "$font_name $font_fn" >> /work/mapfiles/fonts.list; done' \
+ && apt-get -y clean \
+ && rm -rf /var/lib/apt/lists/*
+
COPY site-conf /etc/apache2/sites-available/cspp_geo.conf
# disable the default which would conflict with our custom
RUN a2ensite cspp_geo && a2dissite 000-default
diff --git a/mapserver/mapfiles/basemap.map b/mapserver/mapfiles/basemap.map
new file mode 100644
index 0000000000000000000000000000000000000000..33e7edfb5e0d9b250a00faa20c2ba767f0a98fa9
--- /dev/null
+++ b/mapserver/mapfiles/basemap.map
@@ -0,0 +1,132 @@
+MAP
+ NAME "Basemap"
+ STATUS ON
+ MAXSIZE 5000
+ SIZE 1024 1024
+ IMAGECOLOR 192 192 192
+ IMAGETYPE png256
+ EXTENT -5434894.885 -5434894.885 5434894.885 5434894.885
+ FONTSET "/work/mapfiles/fonts.list"
+
+ PROJECTION
+ "init=epsg:930916"
+ END
+
+ WEB
+ METADATA
+ "wms_title" "BaseMap"
+ 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 1
+ OUTLINECOLOR 128 128 128
+ COLOR 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 1
+ OUTLINECOLOR 128 128 128
+ 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 375000
+ OFFSITE 128 128 128
+ CLASS
+ NAME '10m_lakes'
+ STYLE
+ WIDTH 1
+ OUTLINECOLOR 128 128 128
+ COLOR 192 192 192
+ 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 0.5
+ OUTLINECOLOR 160 160 160
+ END
+ END
+ END
+END
diff --git a/mapserver/mapfiles/borders.map b/mapserver/mapfiles/borders.map
new file mode 100644
index 0000000000000000000000000000000000000000..337c5e3c85362611308a0616cab65f545e36bbd3
--- /dev/null
+++ b/mapserver/mapfiles/borders.map
@@ -0,0 +1,146 @@
+MAP
+ NAME "Borders"
+ STATUS ON
+ MAXSIZE 5000
+ SIZE 1024 1024
+ IMAGECOLOR 128 128 128
+ IMAGETYPE rgb
+ EXTENT -5434894.885 -5434894.885 5434894.885 5434894.885
+ FONTSET "/work/mapfiles/fonts.list"
+
+ PROJECTION
+ "init=epsg:930916"
+ END
+
+ WEB
+ METADATA
+ "wms_title" "Borders"
+ 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
+END
diff --git a/mapserver/mapfiles/g16_abi_radf_l1b.map b/mapserver/mapfiles/g16_abi_radf_l1b.map
index 384b7034056b514e4bd5868d9f991b70147f13d5..a36d09a220cf922551395f224892eeeae8298b16 100644
--- a/mapserver/mapfiles/g16_abi_radf_l1b.map
+++ b/mapserver/mapfiles/g16_abi_radf_l1b.map
@@ -1,4 +1,6 @@
MAP
+ NAME "GOES-16 ABI Full Disk L1b Layers"
+ STATUS ON
IMAGETYPE PNG
SIZE 256 256
EXTENT -5434894.885 -5434894.885 5434894.885 5434894.885
@@ -10,7 +12,7 @@ MAP
WEB
METADATA
- "wms_title" "Weather data"
+ "wms_title" "CSPP Geo Geo2Grid Viewer"
"wms_onlineresource" "https://myhost/mapserv"
"wms_enable_request" "*"
END
diff --git a/mapserver/mapfiles/generic_metadata.map b/mapserver/mapfiles/generic_metadata.map
new file mode 100644
index 0000000000000000000000000000000000000000..f130307eead51a8ea7593afb0e4164fe2b0c84cb
--- /dev/null
+++ b/mapserver/mapfiles/generic_metadata.map
@@ -0,0 +1,3 @@
+ "wms_onlineresource" "https://myhost/mapserv"
+ "wms_enable_request" "*"
+ "wms_srs" "EPSG:4326 EPSG:930916 EPSG:930917"
diff --git a/mapserver/mapfiles/graticules.map b/mapserver/mapfiles/graticules.map
new file mode 100644
index 0000000000000000000000000000000000000000..b7dea2b309cf8dbdae9d17fc3f7622b3e3ff331a
--- /dev/null
+++ b/mapserver/mapfiles/graticules.map
@@ -0,0 +1,159 @@
+MAP
+ NAME "latlongrid"
+ STATUS ON
+ MAXSIZE 5000
+ SIZE 1024 1024
+ EXTENT -180 -90 180 90
+ UNITS DD
+ FONTSET "/work/mapfiles/fonts.list"
+
+ PROJECTION
+ "init=epsg:4326"
+ END
+
+ WEB
+ METADATA
+ "wms_title" "CSPP Geo Geo2Grid Viewer - Graticule Lines"
+ INCLUDE "/work/mapfiles/generic_metadata.map"
+ END
+ END
+
+ INCLUDE '/work/mapfiles/output_formats.map'
+
+ IMAGECOLOR 127 127 127
+ IMAGETYPE rgb
+
+ 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
diff --git a/mapserver/mapfiles/output_formats.map b/mapserver/mapfiles/output_formats.map
new file mode 100644
index 0000000000000000000000000000000000000000..86d37cf271216826856529f0e3146ff5bf2f2df7
--- /dev/null
+++ b/mapserver/mapfiles/output_formats.map
@@ -0,0 +1,87 @@
+# Full color with alpha
+
+ OUTPUTFORMAT
+ NAME "rgba"
+ DRIVER AGG/PNG
+ MIMETYPE "image/png"
+ IMAGEMODE RGBA
+ TRANSPARENT ON
+ EXTENSION "png"
+ END
+
+ OUTPUTFORMAT
+ NAME "rgb"
+ DRIVER AGG/PNG
+ MIMETYPE "image/png"
+ IMAGEMODE RGBA
+ TRANSPARENT ON
+ EXTENSION "png"
+ END
+
+ OUTPUTFORMAT
+ NAME "png"
+ DRIVER AGG/PNG
+ MIMETYPE "image/png"
+ IMAGEMODE RGBA
+ TRANSPARENT ON
+ EXTENSION "png"
+ END
+
+ OUTPUTFORMAT
+ NAME "png24"
+ DRIVER AGG/PNG
+ MIMETYPE "image/png"
+ IMAGEMODE RGBA
+ TRANSPARENT ON
+ EXTENSION "png"
+ END
+
+# 8 bit color with no transparency
+
+ OUTPUTFORMAT
+ NAME "png256"
+ DRIVER AGG/PNG
+ MIMETYPE "image/png"
+ IMAGEMODE RGB
+ FORMATOPTION "QUANTIZE_FORCE=ON"
+ FORMATOPTION "QUANTIZE_DITHER=OFF"
+ FORMATOPTION "QUANTIZE_COLORS=256"
+ EXTENSION "png"
+ END
+
+ OUTPUTFORMAT
+ NAME "png8"
+ DRIVER AGG/PNG8
+ MIMETYPE "image/png"
+ IMAGEMODE PC256
+ FORMATOPTION "QUANTIZE_FORCE=ON"
+ FORMATOPTION "QUANTIZE_DITHER=OFF"
+ FORMATOPTION "QUANTIZE_COLORS=256"
+ FORMATOPTION "PALETTE_FORCE=ON"
+ FORMATOPTION "COMPRESSION=9"
+ TRANSPARENT ON
+ EXTENSION "png"
+ END
+
+ OUTPUTFORMAT
+ NAME "gray"
+ DRIVER AGG/PNG8
+ MIMETYPE "image/png"
+ IMAGEMODE PC256
+ FORMATOPTION "QUANTIZE_FORCE=ON"
+ FORMATOPTION "QUANTIZE_DITHER=OFF"
+ FORMATOPTION "QUANTIZE_COLORS=256"
+ FORMATOPTION "PALETTE_FORCE=ON"
+ FORMATOPTION "COMPRESSION=9"
+ TRANSPARENT ON
+ EXTENSION "png"
+ END
+
+# Other
+
+ OUTPUTFORMAT
+ NAME "geojson"
+ DRIVER "TEMPLATE"
+ MIMETYPE "application/json"
+ FORMATOPTION "FILE=/home/wms/localdata/mapfiles/templates/template0.html"
+ END
diff --git a/mapserver/mapfiles/overlays.map b/mapserver/mapfiles/overlays.map
new file mode 100644
index 0000000000000000000000000000000000000000..20117becf5c247216fd7413610c78c0725df0fcc
--- /dev/null
+++ b/mapserver/mapfiles/overlays.map
@@ -0,0 +1,280 @@
+MAP
+ NAME "Map Overlays"
+ STATUS ON
+ MAXSIZE 5000
+ SIZE 1024 1024
+ IMAGECOLOR 128 128 128
+ IMAGETYPE rgb
+ 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
diff --git a/mapserver/site-conf b/mapserver/site-conf
index b83c316d3b5534c4601d956644a1e4fbfd7fbea4..6dfa9303d4d2c4a51ef4504738c7534ebd973972 100644
--- a/mapserver/site-conf
+++ b/mapserver/site-conf
@@ -29,15 +29,15 @@
# Custom CSPP Geo
RewriteEngine on
- # /wms/goes16/abi/fldk/
- RewriteRule "^/wms/([^/]+)/([^/]+)/([^/]+)/l1b?(.*)" "/cgi-bin/mapserv?map=/work/mapfiles/$1_$2_$3_l1b.map&$4" [PT,QSA]
+ # /wms/g16/abi/radf/l1b?...
+ # /wms/g16/abi/radf/borders?...
+ RewriteRule "^/wms/([^/]+)/([^/]+)/([^/]+)/([^/]+)?(.*)" "/cgi-bin/mapserv?map=/work/mapfiles/$1_$2_$3_$4.map&$5" [PT,QSA]
+ RewriteRule "^/wms/([^/]+)?(.*)" "/cgi-bin/mapserv?map=/work/mapfiles/$1.map&$2" [PT,QSA]
# FCGI version of the above
- RewriteRule "^/fwms/([^/]+)/([^/]+)/([^/]+)/l1b?(.*)" "/cgi-bin/mapserv.fcgi?map=/work/mapfiles/$1_$2_$3_l1b.map&$4" [PT,QSA]
+ RewriteRule "^/fwms/([^/]+)/([^/]+)/([^/]+)/([^/]+)?(.*)" "/cgi-bin/mapserv.fcgi?map=/work/mapfiles/$1_$2_$3_$4.map&$5" [PT,QSA]
+ RewriteRule "^/fwms/([^/]+)?(.*)" "/cgi-bin/mapserv.fcgi?map=/work/mapfiles/$1.map&$2" [PT,QSA]
# /wms_times/g16/abi/radf/true_color
RewriteRule "^/wms_times/([^/]+)/([^/]+)/([^/]+)/([^/]+)" "/cgi-bin/layer_times.py?layer=/data/tiles/$1/$2/$3/$4/$4.shp" [PT,QSA]
- # FIXME: We need to include the sector
- # /data/goes/grb/goes16/2020/2020_01_21_021/abi/L1b/RadF/GOES-16_ABI_RadF_C01_20200121_000016_GOES-East.tif
- # "/data/tiles/g16/abi/radf/true_color/true_color"
LogLevel alert rewrite:trace6
# handler should be added by the enabled module