Merge pull request 'fixes' (#3) from update into master

Reviewed-on: http://sync.virgis.co.uk/ViRGiS/projects/pulls/3
2 years ago · b1110ddd34
parent 71dbbe02c3 040ac44cec
commit b1110ddd34
2 changed files with 564 additions and 731 deletions
--- a/Leaton_test_v2.json
+++ b/Leaton_test_v2.json
@ -9,7 +9,7 @@
    ]
  },
  "scales": [
-    6.690288,
+    6.69028854,
    1.0,
    1.0,
    1.0
@ -20,9 +20,9 @@
    {
      "type": "Point",
      "coordinates": [
-        -2.5741639861526617,
+        -2.5741639861526582,
-        52.69715673226623,
+        52.697156732129116,
-        -24.145044326782227
+        -24.145046234130859
      ]
    },
    {
@ -558,170 +558,3 @@
      "proj4": "EPSG:27700"
    },
    {
      "id": "004",
      "display-name": "Acid Tufts Unit 2",
      "datatype": "Mesh",
      "source": "test_data/Leaton/Tuffs_Unit2.dxf",
      "position": null,
      "transform": {
        "translate": [
          0.0,
          0.0,
          0.0
        ],
        "rotate": [
          0.0,
          0.0,
          0.0,
          1.0
        ],
        "scale": [
          1.0,
          1.0,
          1.0
        ]
      },
      "properties": {
        "units": {
          "point": {
            "color": [
              0.0,
              0.0,
              0.0,
              1.0
            ],
            "shape": "Spheroid",
            "transform": {
              "translate": [
                0.0,
                0.0,
                0.0
              ],
              "rotate": [
                0.0,
                0.0,
                0.0,
                1.0
              ],
              "scale": [
                1.0,
                1.0,
                1.0
              ]
            },
            "label": ""
          },
          "line": {
            "color": [
              0.0,
              0.0,
              0.0,
              1.0
            ],
            "shape": "Spheroid",
            "transform": {
              "translate": [
                0.0,
                0.0,
                0.0
              ],
              "rotate": [
                0.0,
                0.0,
                0.0,
                1.0
              ],
              "scale": [
                1.0,
                1.0,
                1.0
              ]
            },
            "label": ""
          },
          "body": {
            "color": [
              0.0,
              0.0,
              0.0,
              1.0
            ],
            "shape": "Spheroid",
            "transform": {
              "translate": [
                0.0,
                0.0,
                0.0
              ],
              "rotate": [
                0.0,
                0.0,
                0.0,
                1.0
              ],
              "scale": [
                1.0,
                1.0,
                1.0
              ]
            },
            "label": ""
          },
          "handle": {
            "color": [
              0.0,
              0.0,
              0.0,
              1.0
            ],
            "shape": "Spheroid",
            "transform": {
              "translate": [
                0.0,
                0.0,
                0.0
              ],
              "rotate": [
                0.0,
                0.0,
                0.0,
                1.0
              ],
              "scale": [
                1.0,
                1.0,
                1.0
              ]
            },
            "label": ""
          }
        },
        "dem": null,
        "header-string": null,
        "color-mode": "SinglebandGrey",
        "colorinterp": null,
        "filter": null,
        "bbox": null,
        "mapscale": 0,
        "map_size": 0,
        "image_folder": null,
        "bh-data": {
          "x-field": null,
          "y-field": null,
          "z-field": null,
          "id-field": null,
          "inc-field": null,
          "azi-field": null,
          "from-field": null,
          "to-field": null,
          "data-field": null,
          "data-source": null,
          "log-id-field": null,
          "Legend": null,
          "eoh-field": null
        }
      },
      "proj4": "EPSG:27700"
    }
  ]
 }
--- a/dowlow_2021_v1.json
+++ b/dowlow_2021_v1.json
@ -9,7 +9,7 @@
    ]
  },
  "scales": [
-    12.99494,
+    14.8211441,
    1.0,
    1.0,
    1.0
@ -20,9 +20,9 @@
    {
      "type": "Point",
      "coordinates": [
-        -1.8482363078496775,
+        -1.8484594700334367,
-        53.211838109810955,
+        53.211155660397118,
-        381.0130615234375
+        342.3817138671875
      ]
    },
    {