From 040ac44cec86b24d87ee242e1caffe7ceed412df Mon Sep 17 00:00:00 2001 From: runette Date: Sun, 8 Jan 2023 13:02:44 +0000 Subject: [PATCH] fixes --- Leaton_test_v2.json | 1287 +++++++++++++++++++------------------------ dowlow_2021_v1.json | 8 +- 2 files changed, 564 insertions(+), 731 deletions(-) diff --git a/Leaton_test_v2.json b/Leaton_test_v2.json index f28efad..f27cca8 100644 --- a/Leaton_test_v2.json +++ b/Leaton_test_v2.json @@ -1,727 +1,560 @@ -{ - "version": "geo:1.0.4", - "name": "Leaton_test_v2", - "origin": { - "type": "Point", - "coordinates": [ - -2.5731797978768327, - 52.699446074102539 - ] - }, - "scales": [ - 6.690288, - 1.0, - 1.0, - 1.0 - ], - "default_proj": "EPSG:4326", - "grid-scale": 1.0, - "cameras": [ - { - "type": "Point", - "coordinates": [ - -2.5741639861526617, - 52.69715673226623, - -24.145044326782227 - ] - }, - { - "type": "Point", - "coordinates": [ - -2.5782370367178404, - 52.693476425425715, - 37.868717193603516 - ] - }, - { - "type": "Point", - "coordinates": [ - -2.5782370367178404, - 52.693476425425715, - 37.868717193603516 - ] - }, - { - "type": "Point", - "coordinates": [ - -2.5782370367178404, - 52.693476425425715, - 37.868717193603516 - ] - } - ], - "recordsets": [ - { - "id": "001", - "display-name": "Mapbox Map", - "datatype": "MapBox", - "source": "", - "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": 15, - "map_size": 10, - "elevation_source_type": "Custom", - "elevation_layer_type": "TerrainWithElevation", - "imagery_source_type": "MapboxSatellite", - "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": "" - }, - { - "id": "002", - "display-name": "DTM from quarry survey", - "datatype": "DEM", - "source": "test_data/Leaton/LTQU1217_M_xyz_Z.ers", - "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": "band_1", - "color-mode": "SinglebandGrey", - "colorinterp": { - "invert": false, - "k": 0.0, - "mad": false, - "ramp": "blue_red" - }, - "filter": [], - "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" - }, - { - "id": "003", - "display-name": "First Attempt Church Stretton Fault", - "datatype": "Mesh", - "source": "test_data/Leaton/Churchstretton_fault_fill.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" - }, - { - "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" - } - ] -} \ No newline at end of file +{ + "version": "geo:1.0.4", + "name": "Leaton_test_v2", + "origin": { + "type": "Point", + "coordinates": [ + -2.5731797978768327, + 52.699446074102539 + ] + }, + "scales": [ + 6.69028854, + 1.0, + 1.0, + 1.0 + ], + "default_proj": "EPSG:4326", + "grid-scale": 1.0, + "cameras": [ + { + "type": "Point", + "coordinates": [ + -2.5741639861526582, + 52.697156732129116, + -24.145046234130859 + ] + }, + { + "type": "Point", + "coordinates": [ + -2.5782370367178404, + 52.693476425425715, + 37.868717193603516 + ] + }, + { + "type": "Point", + "coordinates": [ + -2.5782370367178404, + 52.693476425425715, + 37.868717193603516 + ] + }, + { + "type": "Point", + "coordinates": [ + -2.5782370367178404, + 52.693476425425715, + 37.868717193603516 + ] + } + ], + "recordsets": [ + { + "id": "001", + "display-name": "Mapbox Map", + "datatype": "MapBox", + "source": "", + "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": 15, + "map_size": 10, + "elevation_source_type": "Custom", + "elevation_layer_type": "TerrainWithElevation", + "imagery_source_type": "MapboxSatellite", + "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": "" + }, + { + "id": "002", + "display-name": "DTM from quarry survey", + "datatype": "DEM", + "source": "test_data/Leaton/LTQU1217_M_xyz_Z.ers", + "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": "band_1", + "color-mode": "SinglebandGrey", + "colorinterp": { + "invert": false, + "k": 0.0, + "mad": false, + "ramp": "blue_red" + }, + "filter": [], + "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" + }, + { + "id": "003", + "display-name": "First Attempt Church Stretton Fault", + "datatype": "Mesh", + "source": "test_data/Leaton/Churchstretton_fault_fill.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" + }, + { \ No newline at end of file diff --git a/dowlow_2021_v1.json b/dowlow_2021_v1.json index be845d4..cf1e3ee 100644 --- 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, - 53.211838109810955, - 381.0130615234375 + -1.8484594700334367, + 53.211155660397118, + 342.3817138671875 ] }, { -- 2.36.2