Skip to content

Commit aefca5f

Browse files
aaimeaaime
committed
Adding access to generalized tables, minor tweaks to existing styles
1 parent d6c671c commit aefca5f

20 files changed

+262
-255
lines changed

‎global.xml

+11-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77
<onlineResource>http://geoserver.org</onlineResource>
88
<verbose>false</verbose>
99
<verboseExceptions>false</verboseExceptions>
10+
<metadata>
11+
<map>
12+
<entry>
13+
<string>quietOnNotFound</string>
14+
<boolean>false</boolean>
15+
</entry>
16+
</map>
17+
</metadata>
1018
<localWorkspaceIncludesPrefix>false</localWorkspaceIncludesPrefix>
1119
</settings>
1220
<jai>
@@ -29,8 +37,10 @@
2937
<queueType>UNBOUNDED</queueType>
3038
<imageIOCacheThreshold>10240</imageIOCacheThreshold>
3139
</coverageAccess>
32-
<updateSequence>1127</updateSequence>
40+
<updateSequence>1171</updateSequence>
3341
<featureTypeCacheSize>0</featureTypeCacheSize>
3442
<globalServices>true</globalServices>
3543
<xmlPostRequestLogBufferSize>1024</xmlPostRequestLogBufferSize>
44+
<xmlExternalEntitiesEnabled>false</xmlExternalEntitiesEnabled>
45+
<webUIMode>DEFAULT</webUIMode>
3646
</global>

‎layergroups/osm.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
<id>LayerInfoImpl--7bb5548c:15abdfdff2c:-7f1c</id>
2929
</published>
3030
<published type="layer">
31-
<id>LayerInfoImpl-631386fb:15abe1cc787:-7ffd</id>
31+
<id>LayerInfoImpl-13cfe2a7:15db6f0417a:29ff</id>
3232
</published>
3333
<published type="layer">
34-
<id>LayerInfoImpl--195a4656:15bc41928c1:-7ea7</id>
34+
<id>LayerInfoImpl-13cfe2a7:15db6f0417a:2a02</id>
3535
</published>
3636
<published type="layer">
37-
<id>LayerInfoImpl--3afbe93:15a98fb383b:-7ff3</id>
37+
<id>LayerInfoImpl-13cfe2a7:15db6f0417a:2a06</id>
3838
</published>
3939
<published type="layer">
40-
<id>LayerInfoImpl--7b086ca4:15c4954cedf:-7ffe</id>
40+
<id>LayerInfoImpl--3afbe93:15a98fb383b:-7ff3</id>
4141
</published>
4242
<published type="layer">
4343
<id>LayerInfoImpl--7d0bbe0a:15b95bcc902:-7ffc</id>
@@ -46,10 +46,10 @@
4646
<id>LayerInfoImpl--4e88ab2d:15cba2fcee0:-7ffd</id>
4747
</published>
4848
<published type="layer">
49-
<id>LayerInfoImpl--4e88ab2d:15cba2fcee0:-7ff9</id>
49+
<id>LayerInfoImpl-13cfe2a7:15db6ceb1bd:-7ffe</id>
5050
</published>
5151
<published type="layer">
52-
<id>LayerInfoImpl-245ba36c:15d937f93b2:-7ffd</id>
52+
<id>LayerInfoImpl-13cfe2a7:15db6eaaf93:2a76</id>
5353
</published>
5454
<published type="layer">
5555
<id>LayerInfoImpl-1d358fdb:15d9cd45627:-7ffe</id>

‎logging.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<logging>
2-
<level>DEFAULT_LOGGING.properties</level>
2+
<level>PRODUCTION_LOGGING.properties</level>
33
<location>logs/geoserver.log</location>
44
<stdOutLogging>true</stdOutLogging>
55
</logging>

‎logs/GEOSERVER_DEVELOPER_LOGGING.properties ‎logs/JDBC_QUERY_LOGGING.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ log4j.appender.geoserverlogfile.layout.ConversionPattern=%d %p [%c] - %m%n
3434
log4j.category.org.geotools=WARN
3535
log4j.category.org.geotools.factory=WARN
3636

37-
log4j.category.org.geoserver=TRACE
38-
log4j.category.org.vfny.geoserver=TRACE
37+
log4j.category.org.geotools.jdbc=TRACE
3938

4039
log4j.category.org.springframework=WARN

‎pregeneralized.xml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<GeneralizationInfos version="1.0" dataSourceNameSpace="osm" dataSourceName="osm">
3+
<!-- ROADS -->
4+
<GeneralizationInfo featureName="roads" baseFeatureName="osm_roads" geomPropertyName="geometry">
5+
<Generalization distance="200" featureName="osm_roads_gen0" geomPropertyName="geometry" />
6+
<Generalization distance="50" featureName="osm_roads_gen1" geomPropertyName="geometry" />
7+
</GeneralizationInfo>
8+
<!-- LAND USAGES -->
9+
<GeneralizationInfo featureName="landusages" baseFeatureName="osm_landusages" geomPropertyName="geometry">
10+
<Generalization distance="200" featureName="osm_landusages_gen0" geomPropertyName="geometry" />
11+
<Generalization distance="50" featureName="osm_landusages_gen1" geomPropertyName="geometry" />
12+
</GeneralizationInfo>
13+
<!-- WATER AREAS -->
14+
<GeneralizationInfo featureName="waterareas" baseFeatureName="osm_waterareas" geomPropertyName="geometry">
15+
<Generalization distance="200" featureName="osm_waterareas_gen0" geomPropertyName="geometry" />
16+
<Generalization distance="50" featureName="osm_waterareas_gen1" geomPropertyName="geometry" />
17+
</GeneralizationInfo>
18+
<!-- WATER WAYS -->
19+
<GeneralizationInfo featureName="waterways" baseFeatureName="osm_waterways" geomPropertyName="geometry">
20+
<Generalization distance="200" featureName="osm_waterways_gen0" geomPropertyName="geometry" />
21+
<Generalization distance="50" featureName="osm_waterways_gen1" geomPropertyName="geometry" />
22+
</GeneralizationInfo>
23+
</GeneralizationInfos>

‎styles/amenities.css

+4-2
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
:mark { fill: #734a08 };
126126
}
127127

128-
[type = 'fountain'] {
128+
[type = 'fountain'][@sd < 6k] {
129129
mark: symbol(circle), symbol(circle);
130130
:nth-mark(1) { fill: #b5d0d0 };
131131
:nth-mark(2) { fill: #576ddf };
@@ -760,11 +760,13 @@ mark: symbol('file://symbols/taoist.svg');
760760

761761
[type = 'peak'][@sd < 400k] {
762762
mark: symbol('file://symbols/peak.svg');
763+
mark-size: 8;
763764
:mark { fill: #d08f55 };
764765
}
765766

766767
[type = 'volcano'][@sd < 400k] {
767-
mark: symbol('file://symbols/peak.svg');
768+
mark: symbol('file://symbols/peak.svg');
769+
mark-size: 8;
768770
:mark { fill: #d40000 };
769771
}
770772

‎styles/roads.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@
475475
[class = 'railway'] {
476476
z-index: 1, 2;
477477

478-
[class = 'railway' and type = 'rail'][@sd < 6M],
478+
[class = 'railway' and type = 'rail' and service = ''][@sd < 6M],
479479
[class = 'railway' and (type = 'preserved' and service in ('spur', 'siding', 'yard')) or
480480
(type = 'rail' and service in ('spur', 'siding', 'yard')) or
481481
(type = 'tram' and service in ('spur', 'siding', 'yard'))][@sd < 100k] {

0 commit comments

Comments
 (0)