Merge pull request #9 from monodo/cleanup_project

Merged.

README.md

@@ -24,7 +24,7 @@ Warning: debug mode is currently activated by default
 1. Edit pytree.yaml configuration file if needed
 2. Run the server: ```python runserver.py```
 3. If the dev server runs fine, the adress [localhost:5001](localhost:5001) will display a demo page
-4. Note: the demo page is there for testing purposes and not actively maintained
+4. Note: pointcloud CRS must be the same as the app calling for profiles. Reprojection is not implemented
 
 ## Production setup
 

example_config.yaml

@@ -1,109 +1,294 @@
 vars:
-    debug: false
-    server_url: your_server_url
+    debug: true
+    server_url: http://localhost:5000
+    log_folder: <path_to>/pytree/log
     gmf_url: ""
-    cpotree_executable: path_to_cpotre.exe
-    # Available point clouds
+    # path to cpotree exectuable
+    cpotree_executable: <path_to>/PotreeElevationProfile.exe
+    # Available point clouds. NOTE: pointclouds CRS must be the same as the APP, reprojection is not implemented!
     pointclouds:
-        my_cloud: path_to_potree_cloud
-
-    # Classification colors
+        sitn2016: <path_to>/cloud.js
+    # point cloud to use in profile
+    default_point_cloud: sitn2016
+    # default profile width
+    width: 10
+    # point size on d3 plot in pixels
+    point_size: 1
+    # Max point number allowed in a profile. Passed this limit (approx...), the following requests are canceled client side (gmf2)
+    max_point_number: 75000
+    # Toralance of lateral movements during vertical pan. Passing this threshold, new points will be requested
+    vertical_pan_tolerance: 0.2
+    # max LOD for first profile request (will extend from LOD 0 to LOD initialLOD)
+    initialLOD: 6
+    # Classification colors for GMF2
     classification_colors:
         0:
             color: 100, 250, 100
-            name: manque de classe
+            name: Unknown
+            value: Unknown
             visible: 1
         1:
             color: 100, 100, 100
-            name: pas de classe
+            name: Unclassified
+            value: Unclassified
             visible: 1
         2:
             color: 200, 200, 200
-            name: sol
+            name: Ground
+            value: Ground
             visible: 1
         3:
             color: 0, 125, 0
-            name: toto
+            name: Low Vegetation
             visible: 1
         4:
             color: 0, 250, 125
-            name: titi
+            name: Medium Vegetation
+            value: Medium Vegetation
             visible: 1
         5:
             color: 40, 150, 0
-            name: vegetation
+            name: High Vegetation
+            value: High Vegetation
             visible: 1
         6:
             color: 140, 50, 0
-            name: batiment
-            visible: 1
-        8:
-            color: 250, 250, 0
-            name: batiment
+            name: Building
+            value: Building
             visible: 1
         7:
             color: 120, 120, 120
-            name: waaw
+            name: Low Point
+            value: Low Point
+            visible: 1
+        8:
+            color: 250, 250, 0
+            name: Key-Point
+            value: Key-Point
             visible: 1
         10:
             color: 0, 89, 98
-            name: 10
+            name: Rail
+            value: Rail
+            visible: 1
+        11:
+            color: 0, 89, 98
+            name: Road Surface
+            value: Road Surface
+            visible: 1
+        12:
+            color: 0, 89, 98
+            name: Overlap
+            value: Overlap
             visible: 1
         13:
             color: 120, 120, 120
-            name: tutu
+            name: Wire Guard
             visible: 1
         14:
             color: 120, 120, 120
-            name: wewe
+            name: Wire Conductor
+            value: Wire Conductor
+            visible: 1
+        15:
+            color: 120, 120, 120
+            name: Transmission Tower
+            visible: 1
+        16:
+            color: 120, 120, 120
+            name: Wire-structure connector
+            value: Wire-structure connector
             visible: 1
-        23:
+        17:
+            color: 120, 120, 120
+            name: Bridge Deck
+            value: Bridge Deck
+            visible: 1
+        18:
             color: 120, 120, 250
-            name: mal connu
+            name: Hihh noise
+            value: Hihh noise
+            visible: 1
+        64:
+            color: 0, 120, 120
+            name: Cars
+            value: Cars
             visible: 1
-        31:
+        65:
             color: 0, 120, 120
-            name: bibi
+            name: Cranes
+            value: Cranes
             visible: 1
+        70:
+            color: 0, 120, 120
+            name: Facades
+            value: Facades
+            visible: 1
+        71:
+            color: 0, 120, 120
+            name: Walls
+            value: Walls
+            visible: 1 
+        99:
+            color: 0, 120, 120
+            name: Outside perimeter
+            value: Outside perimeter
+            visible: 1
+
 
-    # Default profile material
-    default_material: COLOR_PACKED
+    default_color: RGB(250,150,150)
 
-    #NOT IMPLEMENTED: required ?
-    published_attributes: [INTENSITY,COLOR_PACKED,CLASSIFICATION]
+    # Default profile attribute (material)
+    default_attribute: CLASSIFICATION
 
-    #****************************
-    # GMF 1 support
-    #****************************
-
+    # Points attributes and materials. The visible property defines which atribute becomes an option in material select in the lidarpanel
+    default_point_attribute: CLASSIFICATION
+    point_attributes:
+        INTENSITY:
+            name: Intensité
+            value: INTENSITY
+            element: 1
+            bytes: 2
+            visible: 1
+        RGB: # use COLOR_PACKED instead for SITN data sets
+            name: Couleur
+            value: RGB
+            elements: 4
+            bytes: 3
+            visible: 0
+        CLASSIFICATION:
+            name: Classification
+            value: CLASSIFICATION
+            elements: 1
+            bytes: 1
+            visible: 1
+        POSITION_CARTESIAN:
+            name: Position-cartesian
+            value: POSITION_CARTESIAN
+            elements: 3
+            bytes: 12
+            visible: 0
+        POSITION_PROJECTED_PROFILE:
+            name: Position-projected
+            value: POSITION_PROJECTED_PROFILE
+            elements: 2
+            bytes: 8
+            visible: 0
+        COLOR_PACKED:
+            name: Couleur
+            value: COLOR_PACKED
+            elements: 4
+            bytes: 4
+            visible: 1
+
+    # here you can define as many steps as you like
     max_levels:
+      25: 
+        max: 14
+        width: 2
+      50: 
+        max: 13
+        width: 2
+      75: 
+        max: 12
+        width: 3
       100: 
         max: 11
-      250: 
+        width: 3
+      150: 
         max: 10
-      500: 
+        width: 4
+      250: 
         max: 9
+        width: 4
+      350: 
+        max: 9
+        width: 4
+      500: 
+        max: 8
+        width: 5
       1000:
         max: 8
+        width: 5
+      5000:
+        max: 7
+        width: 6
+      7500:
+        max: 6
+        width: 6
       100000:
+        max: 6
+        width: 7
+
+    #****************************
+    # GMF 1 support
+    #****************************
+
+    # min LOD to query
+    minLOD: 0
+    max_levels_gmf1:
+      50: 
+        max: 10
+      100: 
+        max: 10
+      150: 
+        max: 9
+      250: 
+        max: 9
+      350: 
+        max: 8
+      500: 
+        max: 8
+      1000:
+        max: 7
+      5000:
         max: 7
+      7500:
+        max: 6
+      100000:
+        max: 5
 
     # Class that you might have forgotten to define...
     undefined_class: Classe inconnue
-    
-    # LIDAR classes configuration
+
+    # LIDAR classes configuration for GMF1
     classes_names_standard:
-      1: never_classified
+      1: Unclassified
       2: Ground
-      3: Low_Vegetation_2010
-      4: High_Vegetation_2010
-      5: Building_2010
+      3: Low Vegetation
+      4: Medium Vegetation
+      5: High Vegetation
       6: Building
-      7: Low_Point
-      8: Model_Key_point
-      9: Water_2010
-      10: ASPRS_Reserved
-      11: ASPRS_Reserved
+      7: Low Point (noise)
+      8: Model Key-point (mass point)
+      9: Water
+      10: Rail
+      11: Road Surface
+      12: Overlap
+      13: Wire - Guard (Shield)
+      14: Wire - Conductor (Phase)
+      15: Transmission Towers
+      16: Wire-structure Connector
+      17: Bridge Deck
+      18: High Noise
+      64: Voitures
+      65: Grues et temporaire
+      70: Facades
+      71: Murs
+      99: Hors périmetre
+
+    classes_names_normalized:
+      1: Unclassified
+      2: Ground
+      3: Low Vegetation
+      4: Medium Vegetation
+      5: High Vegetation
+      6: Building
+      7: Low Point (noise)
+      8: Model Key-point (mass point)
+      9: Water
+      10: Rail
+      11: Road Surface
       12: Overlap
       13: Wire - Guard (Shield)
       14: Wire - Conductor (Phase)
@@ -117,7 +302,3 @@ vars:
       71: Murs
       99: Hors périmetre
 
-    minLOD: 0
-    maxLOD: 8
-    width: 3
-    default_point_cloud: my_default_cloud