Ajustes. osm-codes/WS#58

Author: 0e1

logistic/main.js

@@ -534,21 +534,21 @@ function generateSelectLevel(base,min_level,size=0)
 
     for (let j=0; j <= endLevel; j++)
     {
-        if( (j % p !== q) || (j > min_level) ) continue;
+        if( (j % p !== q) || (j < min_level) ) continue;
 
         m = (j%4 == 0 ? (j/4)+1 : Math.floor(j/4)+2 )
 
-        const levelSize = (j % 2 === 0)
-            ? Math.pow(2, (endLevel - j) / 2)
-            : Math.pow(2, (endLevel - j - 1) / 2) * 1.41;
+        const area = Math.pow(2, endLevel - j );
+        const side = Math.sqrt(area);
+        const limiar = side*1.18
 
-        const formattedSize = levelSize<1000 ? (Math.round(levelSize*100.0)/100)+'m' : (Math.round(levelSize*100.0/1000)/100)+'km' ;
+        const formattedSize = side<1000 ? (Math.round(side*100.0)/100)+'m' : (Math.round(side*100.0/1000)/100)+'km' ;
 
         const symbol = j % 2 === 0 ? '&#9643;' : '&#9645;';
 
-        const selected = ( Math.floor(size) <= levelSize ? ' selected' : '' )
+        const selected = ( size <= limiar ? ' selected' : '' )
 
-        html += `<option value="${levelValues[j]}"${selected}>L${j} (${m}d) (${formattedSize}) ${symbol}</option>`;
+        html += `<option value="${limiar}"${selected}>L${j} (${m}d) (${formattedSize}) ${symbol}</option>`;
     }
 
     return html
@@ -575,8 +575,6 @@ function isMarkerInsidePolygonOrMultiPolygon(x, y, poly) {
     // Check if the input is a multi-polygon or a single polygon
     const isMultiPolygon = Array.isArray(polys[0]) && Array.isArray(polys[0][0]);
 
-    console.log(isMultiPolygon)
-
     // Function to check if a point is inside a polygon
     const checkInside = (polyPoints) => {
         for (let k = 0, l = polyPoints.length - 1; k < polyPoints.length; l = k++) {

resources/js/def.js

@@ -7,10 +7,6 @@ var cartoAttr = '<a href="https://carto.com/attributions">CARTO</a>';
 var osmAndCartoAttr = osmAttrib + '. ' + cartoAttr;
 var genericAttrib = '<a href="https://wiki.addressforall.org/doc/osmc:Atribui%C3%A7%C3%B5es" target="_help">info</a>';
 
-var levelSize = [1048576,741455.2,524288,370727.6,262144,185363.8,131072,92681.9,65536,46340.95,32768,23170.48,16384,11585.24,8192,5792.62,4096,2896.31,2048,1448.15,1024,724.08,512,362.04,256,181.02,128,90.51,64,45.25,32,22.63,16,11.31,8,5.66,4,2.83,2,1.41,1];
-
-var levelValues =  [600000,400000,300000,200000,150000,100000,75000,50000,30000,25000,19000,13000,9000,6000,4000,3000,2000,1500,1200,700,600,400,300,200,150,100,70,50,30,20,15,12,8,6,4,3,2,1.5,1,0.7,0.5];
-
 var countries = {
     BR:
     {

scientific/main.js

@@ -395,17 +395,17 @@ function generateSelectLevel(base,size=0,filter=0) // 0: all, 1:meio, 2:inteiro,
 
         m = (j%4 == 0 ? (j/4)+1 : Math.floor(j/4)+2 )
 
-        const levelSize = (j % 2 === 0)
-            ? Math.pow(2, (endLevel - j) / 2)
-            : Math.pow(2, (endLevel - j - 1) / 2) * 1.41;
+        const area = Math.pow(2, endLevel - j );
+        const side = Math.sqrt(area);
+        const limiar = side*1.18
 
-        const formattedSize = levelSize<1000 ? (Math.round(levelSize*100.0)/100)+'m' : (Math.round(levelSize*100.0/1000)/100)+'km' ;
+        const formattedSize = side<1000 ? (Math.round(side*100.0)/100)+'m' : (Math.round(side*100.0/1000)/100)+'km' ;
 
         const symbol = j % 2 === 0 ? '&#9643;' : '&#9645;';
 
-        const selected = ( Math.floor(size) <= levelSize ? ' selected' : '' )
+        const selected = ( size <= limiar ? ' selected' : '' )
 
-        html += `<option value="${levelValues[j]}"${selected}>L${j} (${m}d) (${formattedSize}) ${symbol}</option>`;
+        html += `<option value="${limiar}"${selected}>L${j} (${m}d) (${formattedSize}) ${symbol}</option>`;
     }
 
     return html
@@ -416,14 +416,7 @@ function updateSelectLevel()
     let level = document.getElementById('level_size').value
     let filter = document.getElementById('filter_size').value
 
-    let i = 0;
-
-    while (levelValues[i] > level)
-    {
-        i++;
-    }
-
-    document.getElementById('level_size').innerHTML = generateSelectLevel(defaultMap.bases[defaultMap.scientificBase],levelSize[i],filter);
+    document.getElementById('level_size').innerHTML = generateSelectLevel(defaultMap.bases[defaultMap.scientificBase],level,filter);
 }