Skip to content

Commit ec92992

Browse files
authored
Merge pull request #249 from mapswipe/fix-max-zoomlevel
Fix max zoomlevel
2 parents d3beb0a + dc55de0 commit ec92992

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

manager_dashboard/manager_dashboard/create.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ <h3>Project Type Specific Information</h3>
173173
<ul>
174174
<li>
175175
<label for="zoomLevel">Zoom Level</label>
176-
<input type="number" name="zoomLevel" id="zoomLevel" value="18" min="14" max="24">
176+
<input type="number" name="zoomLevel" id="zoomLevel" value="18" min="14" max="22">
177177
<span>We use the Tile Map Service zoom levels. Please check for your area which zoom level is available. For example, Bing imagery is available at zoomlevel 18 for most regions. If you use a custom tile server you may be able to use even higher zoom levels.</span>
178178
</li>
179179
<li>
@@ -276,7 +276,7 @@ <h3>Project Type Specific Information</h3>
276276
<ul>
277277
<li>
278278
<label for="zoomLevelChangeDetection">Zoom Level</label>
279-
<input type="number" name="zoomLevelChangeDetection" id="zoomLevelChangeDetection" value="18" min="16" max="24">
279+
<input type="number" name="zoomLevelChangeDetection" id="zoomLevelChangeDetection" value="18" min="16" max="22">
280280
<span>We use the Tile Map Service zoom levels. Please check for your area which zoom level is available. For example, Bing imagery is available at zoomlevel 18 for most regions. If you use a custom tile server you may be able to use even higher zoom levels.</span>
281281
</li>
282282
<li>

manager_dashboard/manager_dashboard/js/forms.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ function openFile(event) {
148148
// check project size
149149

150150
area = turf.area(feature)/1000000 // area in square kilometers
151-
maxArea = (20 - zoomLevel) * (20 - zoomLevel) * 1250
151+
maxArea = (23 - zoomLevel) * (23 - zoomLevel) * 200
152152
console.log('project size: ' + area + ' sqkm')
153-
if (area > 5000) {
153+
if (area > maxArea) {
154154
throw 'project is to large: ' + area + ' sqkm; ' + 'max allowed size for this zoom level: ' + maxArea + ' sqkm'
155155
}
156156
info_output.innerHTML += 'Project Size: ' + area + ' sqkm<br>';

mapswipe_workers/mapswipe_workers/project_types/build_area/build_area_project.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,13 @@ def validate_geometries(self):
114114

115115
# calculate max area based on zoom level
116116
# for zoom level 18 this will be 5000 square kilometers
117-
max_area = (20 - int(self.zoomLevel)) * (20 - int(self.zoomLevel)) * 1250
117+
# max zoom level is 22
118+
if self.zoomLevel > 22:
119+
raise CustomError(
120+
f"zoom level is to large (max: 22): {self.zoomLevel}."
121+
)
122+
123+
max_area = (23 - int(self.zoomLevel)) * (23 - int(self.zoomLevel)) * 200
118124

119125
if project_area > max_area:
120126
logger.warning(

mapswipe_workers/mapswipe_workers/project_types/change_detection/change_detection_project.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,13 @@ def validate_geometries(self):
117117

118118
# calculate max area based on zoom level
119119
# for zoom level 18 this will be 5000 square kilometers
120-
max_area = (20 - int(self.zoomLevel)) * (20 - int(self.zoomLevel)) * 1250
120+
# max zoom level is 22
121+
if self.zoomLevel > 22:
122+
raise CustomError(
123+
f"zoom level is to large (max: 22): {self.zoomLevel}."
124+
)
125+
126+
max_area = (23 - int(self.zoomLevel)) * (23 - int(self.zoomLevel)) * 200
121127

122128
if project_area > max_area:
123129
logger.warning(

0 commit comments

Comments
 (0)