Skip to content

Commit

Permalink
Merge remote-tracking branch 'gitauto/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomcat7 committed Apr 16, 2015
2 parents ad639aa + c051536 commit 76d2bdc
Show file tree
Hide file tree
Showing 27 changed files with 476 additions and 139 deletions.
3 changes: 2 additions & 1 deletion global.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<pngAcceleration>false</pngAcceleration>
<jpegAcceleration>false</jpegAcceleration>
<allowNativeMosaic>false</allowNativeMosaic>
<allowNativeWarp>false</allowNativeWarp>
</jai>
<coverageAccess>
<maxPoolSize>5</maxPoolSize>
Expand All @@ -30,7 +31,7 @@
<queueType>UNBOUNDED</queueType>
<imageIOCacheThreshold>10240</imageIOCacheThreshold>
</coverageAccess>
<updateSequence>98</updateSequence>
<updateSequence>132</updateSequence>
<featureTypeCacheSize>0</featureTypeCacheSize>
<globalServices>true</globalServices>
<xmlPostRequestLogBufferSize>1024</xmlPostRequestLogBufferSize>
Expand Down
30 changes: 0 additions & 30 deletions gwc-layers/LayerInfoImpl-43000ab6_14b33decb24_-7579.xml

This file was deleted.

30 changes: 0 additions & 30 deletions gwc-layers/LayerInfoImpl-43000ab6_14b33decb24_-757d.xml

This file was deleted.

30 changes: 0 additions & 30 deletions gwc-layers/LayerInfoImpl-43000ab6_14b33decb24_-7ff9.xml

This file was deleted.

30 changes: 0 additions & 30 deletions gwc-layers/LayerInfoImpl-43000ab6_14b52fca5c7_634b.xml

This file was deleted.

Binary file added legendsamples/RLS_rls_reef_fish_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added legendsamples/point.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,12 @@
</latLonBoundingBox>
<projectionPolicy>FORCE_DECLARED</projectionPolicy>
<enabled>true</enabled>
<advertised>false</advertised>
<store class="dataStore">
<id>DataStoreInfoImpl-43000ab6:14b33decb24:-7ffb</id>
</store>
<maxFeatures>0</maxFeatures>
<numDecimals>0</numDecimals>
<overridingServiceSRS>false</overridingServiceSRS>
<circularArcPresent>false</circularArcPresent>
</featureType>
7 changes: 0 additions & 7 deletions workspaces/RLS/IMAS_RLS/RLS_GEOSERVER_SITE_VIEW/filters.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
<?xml version="1.0"?>
<filters>
<filter>
<name>SiteName</name>
<type>String</type>
<label>SiteName</label>
<visualised>true</visualised>
<excludedFromDownload>false</excludedFromDownload>
</filter>
<filter>
<name>geom</name>
<type>Geometry</type>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<featureType>
<id>FeatureTypeInfoImpl--7bdf4b88:14b76abcf72:-7ffa</id>
<name>RLS Site list</name>
<nativeName>RLS_GEOS_SiteList</nativeName>
<id>FeatureTypeInfoImpl--b7b8c26:14c972234d6:-7fdc</id>
<name>RLS_GEOS_M1_DATA</name>
<nativeName>RLS_GEOS_M1_A_DATA</nativeName>
<namespace>
<id>NamespaceInfoImpl-43000ab6:14b33decb24:-7ffc</id>
</namespace>
<title>List of sites that have been surveyed by RLS</title>
<title>Method 1 Fish</title>
<keywords>
<string>RLS_GEOS_M1_A_DATA</string>
<string>features</string>
<string>RLS_GEOS_SiteList</string>
</keywords>
<nativeCRS>GEOGCS[&quot;WGS 84&quot;,
DATUM[&quot;World Geodetic System 1984&quot;,
Expand Down Expand Up @@ -46,6 +46,7 @@
<entry key="time">
<dimensionInfo>
<enabled>false</enabled>
<defaultValue/>
</dimensionInfo>
</entry>
<entry key="elevation">
Expand All @@ -60,4 +61,6 @@
</store>
<maxFeatures>0</maxFeatures>
<numDecimals>0</numDecimals>
<overridingServiceSRS>false</overridingServiceSRS>
<circularArcPresent>false</circularArcPresent>
</featureType>
38 changes: 38 additions & 0 deletions workspaces/RLS/IMAS_RLS/RLS_GEOS_M1_DATA/filters.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0"?>
<filters>
<filter>
<name>Country</name>
<type>String</type>
<label>Country</label>
<visualised>true</visualised>
<excludedFromDownload>false</excludedFromDownload>
</filter>
<filter>
<name>Ecoregion</name>
<type>String</type>
<label>Ecoregion</label>
<visualised>true</visualised>
<excludedFromDownload>false</excludedFromDownload>
</filter>
<filter>
<name>Realm</name>
<type>String</type>
<label>Realm</label>
<visualised>true</visualised>
<excludedFromDownload>false</excludedFromDownload>
</filter>
<filter>
<name>SurveyDate</name>
<type>Timestamp</type>
<label>SurveyDate</label>
<visualised>true</visualised>
<excludedFromDownload>false</excludedFromDownload>
</filter>
<filter>
<name>Family</name>
<type>String</type>
<label>Family</label>
<visualised>true</visualised>
<excludedFromDownload>false</excludedFromDownload>
</filter>
</filters>
15 changes: 15 additions & 0 deletions workspaces/RLS/IMAS_RLS/RLS_GEOS_M1_DATA/layer.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<layer>
<name>RLS_GEOS_M1_DATA</name>
<id>LayerInfoImpl--b7b8c26:14c972234d6:-7fdb</id>
<type>VECTOR</type>
<defaultStyle>
<id>StyleInfoImpl--21071077:14b33c29d5b:-7ffd</id>
</defaultStyle>
<resource class="featureType">
<id>FeatureTypeInfoImpl--b7b8c26:14c972234d6:-7fdc</id>
</resource>
<attribution>
<logoWidth>0</logoWidth>
<logoHeight>0</logoHeight>
</attribution>
</layer>
66 changes: 66 additions & 0 deletions workspaces/RLS/IMAS_RLS/RLS_GEOS_M1_MAP/featuretype.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<featureType>
<id>FeatureTypeInfoImpl--b7b8c26:14c972234d6:-7fd8</id>
<name>RLS_GEOS_M1_MAP</name>
<nativeName>RLS_GEOS_M1_A_MAP</nativeName>
<namespace>
<id>NamespaceInfoImpl-43000ab6:14b33decb24:-7ffc</id>
</namespace>
<title>Method 1 Fish (Map)</title>
<keywords>
<string>RLS_GEOS_M1_A_MAP</string>
<string>features</string>
</keywords>
<nativeCRS>GEOGCS[&quot;WGS 84&quot;,
DATUM[&quot;World Geodetic System 1984&quot;,
SPHEROID[&quot;WGS 84&quot;, 6378137.0, 298.257223563, AUTHORITY[&quot;EPSG&quot;,&quot;7030&quot;]],
AUTHORITY[&quot;EPSG&quot;,&quot;6326&quot;]],
PRIMEM[&quot;Greenwich&quot;, 0.0, AUTHORITY[&quot;EPSG&quot;,&quot;8901&quot;]],
UNIT[&quot;degree&quot;, 0.017453292519943295],
AXIS[&quot;Geodetic longitude&quot;, EAST],
AXIS[&quot;Geodetic latitude&quot;, NORTH],
AUTHORITY[&quot;EPSG&quot;,&quot;4326&quot;]]</nativeCRS>
<srs>EPSG:4326</srs>
<nativeBoundingBox>
<minx>-179.135831</minx>
<maxx>177.182721</maxx>
<miny>-55.046786</miny>
<maxy>78.449001</maxy>
<crs>EPSG:4326</crs>
</nativeBoundingBox>
<latLonBoundingBox>
<minx>-179.135831</minx>
<maxx>177.182721</maxx>
<miny>-55.046786</miny>
<maxy>78.449001</maxy>
<crs>GEOGCS[&quot;WGS84(DD)&quot;,
DATUM[&quot;WGS84&quot;,
SPHEROID[&quot;WGS84&quot;, 6378137.0, 298.257223563]],
PRIMEM[&quot;Greenwich&quot;, 0.0],
UNIT[&quot;degree&quot;, 0.017453292519943295],
AXIS[&quot;Geodetic longitude&quot;, EAST],
AXIS[&quot;Geodetic latitude&quot;, NORTH]]</crs>
</latLonBoundingBox>
<projectionPolicy>FORCE_DECLARED</projectionPolicy>
<enabled>true</enabled>
<metadata>
<entry key="time">
<dimensionInfo>
<enabled>false</enabled>
<defaultValue/>
</dimensionInfo>
</entry>
<entry key="elevation">
<dimensionInfo>
<enabled>false</enabled>
</dimensionInfo>
</entry>
<entry key="cachingEnabled">false</entry>
</metadata>
<store class="dataStore">
<id>DataStoreInfoImpl-43000ab6:14b33decb24:-7ffb</id>
</store>
<maxFeatures>0</maxFeatures>
<numDecimals>0</numDecimals>
<overridingServiceSRS>false</overridingServiceSRS>
<circularArcPresent>false</circularArcPresent>
</featureType>
31 changes: 31 additions & 0 deletions workspaces/RLS/IMAS_RLS/RLS_GEOS_M1_MAP/filters.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0"?>
<filters>
<filter>
<name>Family</name>
<type>String</type>
<label>Family</label>
<visualised>true</visualised>
<excludedFromDownload>false</excludedFromDownload>
</filter>
<filter>
<name>Country</name>
<type>String</type>
<label>Country</label>
<visualised>true</visualised>
<excludedFromDownload>false</excludedFromDownload>
</filter>
<filter>
<name>Ecoregion</name>
<type>String</type>
<label>Ecoregion</label>
<visualised>true</visualised>
<excludedFromDownload>false</excludedFromDownload>
</filter>
<filter>
<name>Realm</name>
<type>String</type>
<label>Realm</label>
<visualised>true</visualised>
<excludedFromDownload>false</excludedFromDownload>
</filter>
</filters>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<layer>
<name>RLS Site list</name>
<id>LayerInfoImpl--7bdf4b88:14b76abcf72:-7ff9</id>
<name>RLS_GEOS_M1_MAP</name>
<id>LayerInfoImpl--b7b8c26:14c972234d6:-7fd7</id>
<type>VECTOR</type>
<defaultStyle>
<id>StyleInfoImpl--21071077:14b33c29d5b:-7ffd</id>
</defaultStyle>
<resource class="featureType">
<id>FeatureTypeInfoImpl--7bdf4b88:14b76abcf72:-7ffa</id>
<id>FeatureTypeInfoImpl--b7b8c26:14c972234d6:-7fd8</id>
</resource>
<attribution>
<logoWidth>0</logoWidth>
Expand Down
Loading

0 comments on commit 76d2bdc

Please sign in to comment.