comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSBuildingsArtifact.java @ 5540:25c2505df28f

Merged
author Christian Lins <christian.lins@intevation.de>
date Wed, 03 Apr 2013 16:00:21 +0200
parents 08262e0ce57a
children
comparison
equal deleted inserted replaced
5539:8d0af912351c 5540:25c2505df28f
100 return FLYSUtils.getRiverSrid(river.getName()); 100 return FLYSUtils.getRiverSrid(river.getName());
101 } 101 }
102 102
103 @Override 103 @Override
104 protected Envelope getExtent(boolean reproject) { 104 protected Envelope getExtent(boolean reproject) {
105 List<Building> buildings = 105 List<Building> buildings;
106 Building.getBuildings(getRiverId(), getName()); 106 String kind = getIdPart(2);
107
108 if (kind != null) {
109 buildings = Building.getBuildings(getRiverId(), Integer.parseInt(kind));
110 } else {
111 buildings = Building.getBuildings(getRiverId(), name);
112 }
107 113
108 Envelope max = null; 114 Envelope max = null;
109 115
110 for (Building b: buildings) { 116 for (Building b: buildings) {
111 Envelope env = b.getGeom().getEnvelopeInternal(); 117 Envelope env = b.getGeom().getEnvelopeInternal();
123 : max; 129 : max;
124 } 130 }
125 131
126 @Override 132 @Override
127 protected String getFilter() { 133 protected String getFilter() {
134 // The expected id string is:
135 // river_id;layer-name;kind
136
137 String kind = getIdPart(2);
138 if (kind != null) {
139 // If kind is provided we filter by kind
140 return "river_id=" + String.valueOf(getRiverId()) +
141 " AND kind_id=" + kind;
142 }
128 return "river_id=" + String.valueOf(getRiverId()) + 143 return "river_id=" + String.valueOf(getRiverId()) +
129 " AND name='" + getName() + "'"; 144 " AND name='" + getName() + "'";
130 } 145 }
131 146
132 @Override 147 @Override

http://dive4elements.wald.intevation.org