Merge pull request #299 from neuromore/master

Version 1.7.3
neuromore · Jul 11, 2023 · 914cc00 · 914cc00
2 parents 1346b3d + 17e7050
commit 914cc00
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 21 deletions.
diff --git a/src/Engine/Graph/Graph.cpp b/src/Engine/Graph/Graph.cpp
@@ -699,7 +699,7 @@ bool Graph::ApplySettings(const GraphSettings& settings)
 			// macht both object UUID and (if nothing matched) object name
 			const bool uuidMatched = (settings.HasObjectUuid(i) == true && object->GetUuidString().IsEqualNoCase(settings.GetObjectUUid(i)));
 			const bool typeMatched = (settings.HasObjectType(i) == true && object->GetType() == settings.GetObjectType(i));
-			const bool nameMatched = (settings.HasObjectName(i) == true && object->GetUuidString().IsEqualNoCase(settings.GetObjectName(i)));
+			const bool nameMatched = (settings.HasObjectName(i) == true && object->GetNameString().IsEqualNoCase(settings.GetObjectName(i)));
 
 			if (typeMatched && (uuidMatched || nameMatched))
 			{

diff --git a/src/Engine/Graph/GraphSettings.cpp b/src/Engine/Graph/GraphSettings.cpp
@@ -104,6 +104,9 @@ bool GraphSettings::Load(const Json::Item& item)
 		if (objectName.IsString() == true)
 			settings.mObjectName = objectName.GetString();
 
+		if (objectType.IsInt() == true)
+			settings.mObjectType = objectType.GetInt();
+
 		settings.mObjectName = objectName.GetString();
 		settings.mName = nameItem.GetString();
 		settings.mValue = valueItem.GetString();

diff --git a/src/Engine/Version.h b/src/Engine/Version.h
@@ -26,6 +26,6 @@
 
 #define NEUROMORE_ENGINE_VERSION_MAJOR 1
 #define NEUROMORE_ENGINE_VERSION_MINOR 7
-#define NEUROMORE_ENGINE_VERSION_PATCH 2
+#define NEUROMORE_ENGINE_VERSION_PATCH 3
 
 #endif
diff --git a/src/QtBase/Resources/Layouts/Default.layout b/src/QtBase/Resources/Layouts/Default.layout
@@ -1,15 +1,15 @@
 {
     "versionHigh": 1,
     "versionLow": 0,
-    "compileDate": "Feb 28 2022",
+    "compileDate": "Jul 11 2023",
     "mainWindow": {
         "posX": 0,
         "posY": 0,
         "width": 1920,
         "height": 1080,
         "isMaximized": true,
-        "geometry": "AdnQywADAAD/////////+AAAB4AAAAQIAAABhgAAABQAAAU6AAAB5QAAAAACAAAAB4AAAAAAAAAAFwAAB38AAAQH",
-        "state": "AAAA/wAAAAD9AAAAAQAAAAIAAAeAAAAD2/wBAAAAA/wAAAAAAAABIgAAAL8A/////AIAAAAJ+wAAACoAUABMAFUARwBJAE4AMQA3ADQAOQA5ADIAOQA2ADIAMQAxADcANwA1ADUBAAAAFQAAAmcAAAAAAAAAAPsAAAAoAFAATABVAEcASQBOADEAMgA4ADUAOQA5ADkANwA2ADIAMgAwADQAOAAAAAAUAAABRwAAAAAAAAAA+wAAACoAUABMAFUARwBJAE4AMgAxADYAMQA2ADIAMAAyADQANwAxADMANAA0ADUBAAAAFgAAAs0AAAB1AP////wAAALnAAABCgAAAK4BAAAW+gAAAAABAAAAAvsAAAAqAFAATABVAEcASQBOADEANQA1ADMAMQAzADEAMgA1ADcAMQA2ADAANgA4AQAAAAAAAAEiAAAAnAD////7AAAASABkADcAMQA5AGEANQA0ADEALQBkADkANwAxAC0ANAAwAGEANwAtADgAMQA2ADcALQBkADMAYwA2AGQAYwA3ADUAOQA3ADAAMQEAAAAA/////wAAAIQA/////AAAAJMAAAGUAAAAAAD////6AAAAAAEAAAAC+wAAAEgAMABjAGIAOABjADAAMwAyAC0AMgBlADQANgAtADQANgBjAGIALQA4ADkAYgA0AC0ANwAzADEAYwA2ADMAMQBhADAANgA5AGQAAAAAAP////8AAAAAAAAAAPsAAABIADcAOQAzAGMANwBlADQAMgAtADIAOQBiAGUALQA0ADkAMwAzAC0AYQA2AGEAOQAtAGIAYwA3AGIAMgAyAGUAYgA0AGQAMwAzAQAAAAAAAAFyAAAAAAAAAAD7AAAASAA4AGEAZQBiAGUAMwA1AGIALQA2ADYAZQAxAC0ANABjAGQAMAAtADgAMwA1AGEALQBmAGQAMwA2ADMANwBlADQAMwAyADUAYQAAAADoAAABDgAAAAAAAAAA+wAAACgAUABMAFUARwBJAE4AMQA4ADAAMgAzADIANAA5ADcANgAyADgAOQA5AAAAATcAAALCAAAAAAAAAAD7AAAAKABQAEwAVQBHAEkATgA3ADMAOQAzADMAMAA4ADMANAAxADcAMQAxADgAAAABhgAAAYMAAAAAAAAAAPsAAAAoAFAATABVAEcASQBOADEAOQA2ADAAMQA5ADMAOAA5ADEANgA1ADMAMgAAAAKfAAABZAAAAAAAAAAA/AAAASYAAAZaAAACMQD////8AQAAAAP8AAABJgAABloAAAIxAP////wCAAAABPwAAAAWAAACzQAAAGcBAAAW+gAAAAABAAAAA/sAAABIADMAMQA5ADkAMAA5ADUAYgAtADgAMAA0ADYALQA0AGEAZQA4AC0AOAA2AGMAMgAtAGQAMwA2AGQAMAA5AGIAOQBiADMAMQBlAQAAAVUAAAYrAAABiQD////7AAAASABkADcAYQBiADkANwBlADQALQAxADcANAAzAC0ANAA4ADQAZgAtAGIANQAyAGEALQBiADQAOABhAGYAYgBmADAAMwAwADkAZAEAAAAA/////wAAAJUA////+wAAAEgAZgBiADEAMQA2ADkANQAxAC0ANQBlAGMANwAtADQAYwBkADUALQBiADQAZAAxAC0AZQA5AGEAOAAzADQAYQBlADIAMgAwADcBAAAAAP////8AAAB+AP////wAAALnAAABCgAAAQoBAAAW+gAAAAABAAAABfsAAAAoAFAATABVAEcASQBOADIAMwA5ADMAMAA1ADcANAAwADEANwA1ADgAOAEAAAEmAAAGWgAAAjEA////+wAAAEgAMQA2ADYAYQBmAGIANABiAC0ANwAzAGMANwAtADQAZAAzAGYALQA4AGYAMAA4AC0AMwBlADkAMQBkADgANgA0AGQANQAxADABAAAAAP////8AAAB0AP////sAAABIADQAZQA5ADgAOAAwADUAMAAtADAAOQA2ADgALQA0AGQAOAAyAC0AYgA3ADQAYQAtAGEAYgAxADQANgBkADMAMAA3AGQAYgBjAQAAAAD/////AAAAgQD////7AAAASAA1ADcAZAAzADkAZgBhAGUALQBhADUAZQA0AC0ANAAwAGIAZgAtAGEAMwBhAGIALQA3AGMAMQBiADcANwBhADUAYQA0ADMAZAEAAAAA/////wAAAjEA////+wAAAEgAOAAzAGIAMwA0AGYAYgA3AC0ANwAzADgAZAAtADQAYQA1ADUALQBiADAAZgAyAC0ANwAwADAAMQA2ADAANQA2ADcAYwAyAGEBAAAAAP////8AAAFQAP////sAAAAoAFAATABVAEcASQBOADQAMQAwADMAMQA0ADEANwAyADEAMAA2ADUANwEAAAFQAAADIQAAAAAAAAAA/AAAAUYAAAMrAAAAAAD////6AAAAAAEAAAAF+wAAACYAUABMAFUARwBJAE4AMQA5ADEANAA3ADcANgAzADEANAAwADgAOAEAAAAA/////wAAAAAAAAAA+wAAACoAUABMAFUARwBJAE4AMgAyADQANwA3ADIAMwA1ADgAMgAxADAANAA4ADEAAAAAAP////8AAAAAAAAAAPsAAAAmAFAATABVAEcASQBOADEAMAA0ADIAMgA2ADEANwA0ADgANQA5ADAAAAAAAP////8AAAAAAAAAAPsAAAAqAFAATABVAEcASQBOADIANAA3ADYAMwAxADAAOAAxADkAMwAyADIANAA4AAAAAAD/////AAAAAAAAAAD7AAAAKgBQAEwAVQBHAEkATgAzADAAMwAwADUAMwAyADUAOAAyADMAMgA2ADcANwAAAAGdAAAF4wAAAAAAAAAA/AAABkcAAAE5AAAAAAD////8AgAAAAn7AAAANABHAHIAYQBwAGgAUABsAHUAZwBpAG4AOgA6AFAAYQBsAGUAdAB0AGUAVwBpAGQAZwBlAHQBAAAByQAAAH4AAAAAAAAAAPsAAAA6AEcAcgBhAHAAaABQAGwAdQBnAGkAbgA6ADoAQQB0AHQAcgBpAGIAdQB0AGUAcwBXAGkAZABnAGUAdAEAAAJLAAAApQAAAAAAAAAA+wAAADYARwByAGEAcABoAFAAbAB1AGcAaQBuADoAOgBSAGUAcwBvAHUAcgBjAGUAVwBpAGQAZwBlAHQBAAADlwAAANoAAAAAAAAAAPsAAAAqAFAATABVAEcASQBOADIAMQA2ADMAMQAzADAANQAxADIAMgA5ADQANAAxAQAAAjkAAAB2AAAAAAAAAAD7AAAAPgBDAGwAYQBzAHMAaQBmAGkAZQByAFAAbAB1AGcAaQBuADoAOgBQAGEAbABlAHQAdABlAFcAaQBkAGcAZQB0AQAAAlQAAACCAAAAAAAAAAD7AAAARABDAGwAYQBzAHMAaQBmAGkAZQByAFAAbAB1AGcAaQBuADoAOgBBAHQAdAByAGkAYgB1AHQAZQBzAFcAaQBkAGcAZQB0AQAAAtoAAADEAAAAAAAAAAD7AAAAQABDAGwAYQBzAHMAaQBmAGkAZQByAFAAbAB1AGcAaQBuADoAOgBSAGUAcwBvAHUAcgBjAGUAVwBpAGQAZwBlAHQBAAADogAAAM8AAAAAAAAAAPsAAAA4AEMAbABhAHMAcwBpAGYAaQBlAHIAUABsAHUAZwBpAG4AOgA6AEEAdAB0AHIAaQBiAHUAdABlAHMBAAABmAAAAUkAAAAAAAAAAPsAAAA2AEMAbABhAHMAcwBpAGYAaQBlAHIAUABsAHUAZwBpAG4AOgA6AFIAZQBzAG8AdQByAGMAZQBzAQAAAuUAAAD2AAAAAAAAAAD7AAAAKABQAEwAVQBHAEkATgAxADcANgAwADEAOQA2ADkAMwAxADcANwAxADkCAAAEnAAAAD0AAAH0AAACQvsAAABIADkAMQBlADEAZgA1ADEANAAtADAAMQAwADMALQA0AGEAMABmAC0AYQBkADAANgAtADgAZABiAGIAMAA2AGUAMgA3ADEAZQA4AgAAAvcAAAFiAAABkAAAASwAAAeAAAAAAAAAAAQAAAAEAAAACAAAAAj8AAAAAA=="
+        "geometry": "AdnQywADAAD/////////+AAACgAAAAVwAAADwAAAAcgAAAbkAAADuAAAAAACAAAACgAAAAAAAAAAFwAACf8AAAVv",
+        "state": "AAAA/wAAAAD9AAAAAQAAAAIAAAoAAAAFQ/wBAAAAA/wAAAAAAAABnAAAASkA/////AIAAAAK+wAAACoAUABMAFUARwBJAE4AMQA3ADQAOQA5ADIAOQA2ADIAMQAxADcANwA1ADUBAAAAFQAAAmcAAAAAAAAAAPsAAAAoAFAATABVAEcASQBOADEAMgA4ADUAOQA5ADkANwA2ADIAMgAwADQAOAAAAAAUAAABRwAAAAAAAAAA+wAAACoAUABMAFUARwBJAE4AMgAxADYAMQA2ADIAMAAyADQANwAxADMANAA0ADUBAAAAFgAAAbsAAAB1AP////sAAABIADgAMwBiADMANABmAGIANwAtADcAMwA4AGQALQA0AGEANQA1AC0AYgAwAGYAMgAtADcAMAAwADEANgAwADUANgA3AGMAMgBhAQAAAdUAAAFqAAABXAD////8AAADQwAAAhYAAADoAQAAFvoAAAAAAQAAAAL7AAAAKgBQAEwAVQBHAEkATgAxADUANQAzADEAMwAxADIANQA3ADEANgAwADYAOAEAAAAAAAABIgAAAPUA////+wAAAEgAZAA3ADEAOQBhADUANAAxAC0AZAA5ADcAMQAtADQAMABhADcALQA4ADEANgA3AC0AZAAzAGMANgBkAGMANwA1ADkANwAwADEBAAAAAP////8AAACEAP////wAAACTAAABlAAAAAAA////+gAAAAABAAAAAvsAAABIADAAYwBiADgAYwAwADMAMgAtADIAZQA0ADYALQA0ADYAYwBiAC0AOAA5AGIANAAtADcAMwAxAGMANgAzADEAYQAwADYAOQBkAAAAAAD/////AAAAAAAAAAD7AAAASAA3ADkAMwBjADcAZQA0ADIALQAyADkAYgBlAC0ANAA5ADMAMwAtAGEANgBhADkALQBiAGMANwBiADIAMgBlAGIANABkADMAMwEAAAAAAAABcgAAAAAAAAAA+wAAAEgAOABhAGUAYgBlADMANQBiAC0ANgA2AGUAMQAtADQAYwBkADAALQA4ADMANQBhAC0AZgBkADMANgAzADcAZQA0ADMAMgA1AGEAAAAA6AAAAQ4AAAAAAAAAAPsAAAAoAFAATABVAEcASQBOADEAOAAwADIAMwAyADQAOQA3ADYAMgA4ADkAOQAAAAE3AAACwgAAAAAAAAAA+wAAACgAUABMAFUARwBJAE4ANwAzADkAMwAzADAAOAAzADQAMQA3ADEAMQA4AAAAAYYAAAGDAAAAAAAAAAD7AAAAKABQAEwAVQBHAEkATgAxADkANgAwADEAOQAzADgAOQAxADYANQAzADIAAAACnwAAAWQAAAAAAAAAAPwAAAGgAAAIYAAAAfAA/////AEAAAAD/AAAAaAAAAhgAAAB8AD////8AgAAAAT8AAAAFgAAA6EAAABnAQAAFvoAAAAAAQAAAAP7AAAASAAzADEAOQA5ADAAOQA1AGIALQA4ADAANAA2AC0ANABhAGUAOAAtADgANgBjADIALQBkADMANgBkADAAOQBiADkAYgAzADEAZQEAAAFVAAAGKwAAAYkA////+wAAAEgAZAA3AGEAYgA5ADcAZQA0AC0AMQA3ADQAMwAtADQAOAA0AGYALQBiADUAMgBhAC0AYgA0ADgAYQBmAGIAZgAwADMAMAA5AGQBAAAAAP////8AAACVAP////sAAABIAGYAYgAxADEANgA5ADUAMQAtADUAZQBjADcALQA0AGMAZAA1AC0AYgA0AGQAMQAtAGUAOQBhADgAMwA0AGEAZQAyADIAMAA3AQAAAAD/////AAAAfgD////8AAADuwAAAZ4AAADjAQAAFvoAAAADAQAAAAT7AAAAKABQAEwAVQBHAEkATgAyADMAOQAzADAANQA3ADQAMAAxADcANQA4ADgBAAABJgAABloAAAHwAP////sAAABIADEANgA2AGEAZgBiADQAYgAtADcAMwBjADcALQA0AGQAMwBmAC0AOABmADAAOAAtADMAZQA5ADEAZAA4ADYANABkADUAMQAwAQAAAAD/////AAAAdAD////7AAAASAA0AGUAOQA4ADgAMAA1ADAALQAwADkANgA4AC0ANABkADgAMgAtAGIANwA0AGEALQBhAGIAMQA0ADYAZAAzADAANwBkAGIAYwEAAAAA/////wAAAIEA////+wAAAEgANQA3AGQAMwA5AGYAYQBlAC0AYQA1AGUANAAtADQAMABiAGYALQBhADMAYQBiAC0ANwBjADEAYgA3ADcAYQA1AGEANAAzAGQBAAAAAP////8AAAHwAP////sAAAAoAFAATABVAEcASQBOADQAMQAwADMAMQA0ADEANwAyADEAMAA2ADUANwEAAAFQAAADIQAAAAAAAAAA/AAAAUYAAAMrAAAAAAD////6AAAAAAEAAAAF+wAAACYAUABMAFUARwBJAE4AMQA5ADEANAA3ADcANgAzADEANAAwADgAOAEAAAAA/////wAAAAAAAAAA+wAAACoAUABMAFUARwBJAE4AMgAyADQANwA3ADIAMwA1ADgAMgAxADAANAA4ADEAAAAAAP////8AAAAAAAAAAPsAAAAmAFAATABVAEcASQBOADEAMAA0ADIAMgA2ADEANwA0ADgANQA5ADAAAAAAAP////8AAAAAAAAAAPsAAAAqAFAATABVAEcASQBOADIANAA3ADYAMwAxADAAOAAxADkAMwAyADIANAA4AAAAAAD/////AAAAAAAAAAD7AAAAKgBQAEwAVQBHAEkATgAzADAAMwAwADUAMwAyADUAOAAyADMAMgA2ADcANwAAAAGdAAAF4wAAAAAAAAAA/AAABkcAAAE5AAAAAAD////8AgAAAAn7AAAANABHAHIAYQBwAGgAUABsAHUAZwBpAG4AOgA6AFAAYQBsAGUAdAB0AGUAVwBpAGQAZwBlAHQBAAAByQAAAH4AAAAAAAAAAPsAAAA6AEcAcgBhAHAAaABQAGwAdQBnAGkAbgA6ADoAQQB0AHQAcgBpAGIAdQB0AGUAcwBXAGkAZABnAGUAdAEAAAJLAAAApQAAAAAAAAAA+wAAADYARwByAGEAcABoAFAAbAB1AGcAaQBuADoAOgBSAGUAcwBvAHUAcgBjAGUAVwBpAGQAZwBlAHQBAAADlwAAANoAAAAAAAAAAPsAAAAqAFAATABVAEcASQBOADIAMQA2ADMAMQAzADAANQAxADIAMgA5ADQANAAxAQAAAjkAAAB2AAAAAAAAAAD7AAAAPgBDAGwAYQBzAHMAaQBmAGkAZQByAFAAbAB1AGcAaQBuADoAOgBQAGEAbABlAHQAdABlAFcAaQBkAGcAZQB0AQAAAlQAAACCAAAAAAAAAAD7AAAARABDAGwAYQBzAHMAaQBmAGkAZQByAFAAbAB1AGcAaQBuADoAOgBBAHQAdAByAGkAYgB1AHQAZQBzAFcAaQBkAGcAZQB0AQAAAtoAAADEAAAAAAAAAAD7AAAAQABDAGwAYQBzAHMAaQBmAGkAZQByAFAAbAB1AGcAaQBuADoAOgBSAGUAcwBvAHUAcgBjAGUAVwBpAGQAZwBlAHQBAAADogAAAM8AAAAAAAAAAPsAAAA4AEMAbABhAHMAcwBpAGYAaQBlAHIAUABsAHUAZwBpAG4AOgA6AEEAdAB0AHIAaQBiAHUAdABlAHMBAAABmAAAAUkAAAAAAAAAAPsAAAA2AEMAbABhAHMAcwBpAGYAaQBlAHIAUABsAHUAZwBpAG4AOgA6AFIAZQBzAG8AdQByAGMAZQBzAQAAAuUAAAD2AAAAAAAAAAD7AAAAKABQAEwAVQBHAEkATgAxADcANgAwADEAOQA2ADkAMwAxADcANwAxADkCAAAEnAAAAD0AAAH0AAACQvsAAABIADkAMQBlADEAZgA1ADEANAAtADAAMQAwADMALQA0AGEAMABmAC0AYQBkADAANgAtADgAZABiAGIAMAA2AGUAMgA3ADEAZQA4AgAAAvcAAAFiAAABkAAAASwAAAoAAAAAAAAAAAQAAAAEAAAACAAAAAj8AAAAAA=="
     },
     "plugins": [
         {

diff --git a/src/QtBase/Resources/Layouts/ExperiencePlayer.layout b/src/QtBase/Resources/Layouts/ExperiencePlayer.layout
@@ -1,15 +1,15 @@
 {
     "versionHigh": 1,
     "versionLow": 0,
-    "compileDate": "Nov  4 2016",
+    "compileDate": "Jul 11 2023",
     "mainWindow": {
         "posX": 0,
         "posY": 0,
         "width": 1920,
         "height": 1080,
         "isMaximized": true,
-        "geometry": "AdnQywACAAD////3////9wAACggAAAV2AAADwAAAAccAAASHAAACKgAAAAACAAAACgA=",
-        "state": "AAAA/wAAAAD9AAAAAQAAAAIAAAoAAAAFOPwBAAAAAvwAAAAAAAAB3AAAAK0A/////AIAAAAI+wAAACoAUABMAFUARwBJAE4AMQA3ADQAOQA5ADIAOQA2ADIAMQAxADcANwA1ADUBAAAAFQAAAmcAAAAAAAAAAPsAAAAoAFAATABVAEcASQBOADEAMgA4ADUAOQA5ADkANwA2ADIAMgAwADQAOAAAAAAUAAABRwAAAAAAAAAA/AAAABkAAAN5AAAAZwD////6AAAAAAEAAAAC+wAAAEgAMABjAGIAOABjADAAMwAyAC0AMgBlADQANgAtADQANgBjAGIALQA4ADkAYgA0AC0ANwAzADEAYwA2ADMAMQBhADAANgA5AGQBAAAAAP////8AAACtAP////sAAABIADcAOQAzAGMANwBlADQAMgAtADIAOQBiAGUALQA0ADkAMwAzAC0AYQA2AGEAOQAtAGIAYwA3AGIAMgAyAGUAYgA0AGQAMwAzAQAAAAAAAAFyAAAAAAAAAAD7AAAASAAxADIANgBjADgAZgBjADMALQA4ADkAMwA1AC0ANAA5ADAAYwAtAGIAZQA3ADkALQA2ADMAZAA2ADMAZQAxADAAMwAyADgAMgAAAAMQAAABLQAAAAAAAAAA+wAAACoAUABMAFUARwBJAE4AMQA1ADUAMwAxADMAMQAyADUANwAxADYAMAA2ADgBAAADlwAAAboAAABcAP////sAAAAoAFAATABVAEcASQBOADEAOAAwADIAMwAyADQAOQA3ADYAMgA4ADkAOQAAAAK4AAABTwAAAAAAAAAA+wAAACgAUABMAFUARwBJAE4ANwAzADkAMwAzADAAOAAzADQAMQA3ADEAMQA4AAAAAYYAAAGDAAAAAAAAAAD7AAAAKABQAEwAVQBHAEkATgAxADkANgAwADEAOQAzADgAOQAxADYANQAzADIAAAACnwAAAWQAAAAAAAAAAPwAAAHhAAAIHwAAAQoA/////AEAAAAD/AAAAeEAAAZOAAAAgQD////8AgAAAAb7AAAAKABQAEwAVQBHAEkATgAyADMAOQAzADAANQA3ADQAMAAxADcANQA4ADgAAAAAFgAAAKQAAAAAAAAAAPsAAABIADMAMQA5ADkAMAA5ADUAYgAtADgAMAA0ADYALQA0AGEAZQA4AC0AOAA2AGMAMgAtAGQAMwA2AGQAMAA5AGIAOQBiADMAMQBlAAAAABYAAAJ1AAAAAAAAAAD7AAAASABkADYAMQBlADUAYgAwAGEALQBmAGYAMAA1AC0ANAA1ADQAMwAtAGEANQBiADEALQA1ADAAMQBkADYAYQAwADIAMQAwAGYANQEAAAAZAAABzQAAAFAA////+wAAAEgAOABmADUAOQBhADMAZgBlAC0AZQA2ADYAZAAtADQAYgA4ADYALQA5AGYANQBlAC0AMgBkAGYAYgA2ADUAOQA1AGIAZQBjADABAAAB6wAAA2YAAABkAP////sAAAAoAFAATABVAEcASQBOADQAMQAwADMAMQA0ADEANwAyADEAMAA2ADUANwEAAAFQAAADIQAAAAAAAAAA/AAAAUYAAAMrAAAAAAD////6AAAAAAEAAAAF+wAAACYAUABMAFUARwBJAE4AMQA5ADEANAA3ADcANgAzADEANAAwADgAOAEAAAAA/////wAAAAAAAAAA+wAAACoAUABMAFUARwBJAE4AMgAyADQANwA3ADIAMwA1ADgAMgAxADAANAA4ADEAAAAAAP////8AAAAAAAAAAPsAAAAmAFAATABVAEcASQBOADEAMAA0ADIAMgA2ADEANwA0ADgANQA5ADAAAAAAAP////8AAAAAAAAAAPsAAAAqAFAATABVAEcASQBOADIANAA3ADYAMwAxADAAOAAxADkAMwAyADIANAA4AAAAAAD/////AAAAAAAAAAD7AAAAKgBQAEwAVQBHAEkATgAzADAAMwAwADUAMwAyADUAOAAyADMAMgA2ADcANwAAAAGdAAAF4wAAAAAAAAAA/AAACDQAAAHMAAAAhAD////8AgAAAAr7AAAANABHAHIAYQBwAGgAUABsAHUAZwBpAG4AOgA6AFAAYQBsAGUAdAB0AGUAVwBpAGQAZwBlAHQBAAAByQAAAH4AAAAAAAAAAPsAAAA6AEcAcgBhAHAAaABQAGwAdQBnAGkAbgA6ADoAQQB0AHQAcgBpAGIAdQB0AGUAcwBXAGkAZABnAGUAdAEAAAJLAAAApQAAAAAAAAAA/AAAABkAAAU4AAAAXAD////8AQAAAAL7AAAAKgBQAEwAVQBHAEkATgAyADEANgAxADYAMgAwADIANAA3ADEAMwA0ADQANQAAAAYjAAAAvwAAAAAAAAAA+wAAAEgAOABhAGUAYgBlADMANQBiAC0ANgA2AGUAMQAtADQAYwBkADAALQA4ADMANQBhAC0AZgBkADMANgAzADcAZQA0ADMAMgA1AGEBAAAINAAAAcwAAACEAP////sAAAA2AEcAcgBhAHAAaABQAGwAdQBnAGkAbgA6ADoAUgBlAHMAbwB1AHIAYwBlAFcAaQBkAGcAZQB0AQAAA5cAAADaAAAAAAAAAAD7AAAAKgBQAEwAVQBHAEkATgAyADEANgAzADEAMwAwADUAMQAyADIAOQA0ADQAMQEAAAI5AAAAdgAAAAAAAAAA+wAAAD4AQwBsAGEAcwBzAGkAZgBpAGUAcgBQAGwAdQBnAGkAbgA6ADoAUABhAGwAZQB0AHQAZQBXAGkAZABnAGUAdAEAAAJUAAAAggAAAAAAAAAA+wAAAEQAQwBsAGEAcwBzAGkAZgBpAGUAcgBQAGwAdQBnAGkAbgA6ADoAQQB0AHQAcgBpAGIAdQB0AGUAcwBXAGkAZABnAGUAdAEAAALaAAAAxAAAAAAAAAAA+wAAAEAAQwBsAGEAcwBzAGkAZgBpAGUAcgBQAGwAdQBnAGkAbgA6ADoAUgBlAHMAbwB1AHIAYwBlAFcAaQBkAGcAZQB0AQAAA6IAAADPAAAAAAAAAAD7AAAAOABDAGwAYQBzAHMAaQBmAGkAZQByAFAAbAB1AGcAaQBuADoAOgBBAHQAdAByAGkAYgB1AHQAZQBzAQAAAZgAAAFJAAAAAAAAAAD7AAAANgBDAGwAYQBzAHMAaQBmAGkAZQByAFAAbAB1AGcAaQBuADoAOgBSAGUAcwBvAHUAcgBjAGUAcwEAAALlAAAA9gAAAAAAAAAA+wAAACgAUABMAFUARwBJAE4AMQA3ADYAMAAxADkANgA5ADMAMQA3ADcAMQA5AgAABJwAAAA9AAAB9AAAAkIAAAoAAAAAAAAAAAQAAAAEAAAACAAAAAj8AAAAAA=="
+        "geometry": "AdnQywADAAD/////////+AAACgAAAAVwAAAA3AAAAIEAAAbkAAAD5wAAAAACAAAACgAAAAAAAAAAFwAACf8AAAVv",
+        "state": "AAAA/wAAAAD9AAAAAQAAAAIAAAoAAAAFQ/wBAAAAAvwAAAAAAAABXQAAASkA/////AIAAAAI+wAAACoAUABMAFUARwBJAE4AMQA3ADQAOQA5ADIAOQA2ADIAMQAxADcANwA1ADUBAAAAFQAAAmcAAAAAAAAAAPsAAAAoAFAATABVAEcASQBOADEAMgA4ADUAOQA5ADkANwA2ADIAMgAwADQAOAAAAAAUAAABRwAAAAAAAAAA/AAAABYAAAOIAAABXAD////6AAAAAAEAAAAC+wAAAEgAMABjAGIAOABjADAAMwAyAC0AMgBlADQANgAtADQANgBjAGIALQA4ADkAYgA0AC0ANwAzADEAYwA2ADMAMQBhADAANgA5AGQBAAAAAP////8AAAEpAP////sAAABIADcAOQAzAGMANwBlADQAMgAtADIAOQBiAGUALQA0ADkAMwAzAC0AYQA2AGEAOQAtAGIAYwA3AGIAMgAyAGUAYgA0AGQAMwAzAQAAAAAAAAFyAAAAAAAAAAD7AAAASAAxADIANgBjADgAZgBjADMALQA4ADkAMwA1AC0ANAA5ADAAYwAtAGIAZQA3ADkALQA2ADMAZAA2ADMAZQAxADAAMwAyADgAMgAAAAMQAAABLQAAAAAAAAAA+wAAACoAUABMAFUARwBJAE4AMQA1ADUAMwAxADMAMQAyADUANwAxADYAMAA2ADgBAAADogAAAbcAAACqAP////sAAAAoAFAATABVAEcASQBOADEAOAAwADIAMwAyADQAOQA3ADYAMgA4ADkAOQAAAAK4AAABTwAAAAAAAAAA+wAAACgAUABMAFUARwBJAE4ANwAzADkAMwAzADAAOAAzADQAMQA3ADEAMQA4AAAAAYYAAAGDAAAAAAAAAAD7AAAAKABQAEwAVQBHAEkATgAxADkANgAwADEAOQAzADgAOQAxADYANQAzADIAAAACnwAAAWQAAAAAAAAAAPwAAAFhAAAInwAAAQkA/////AEAAAAD/AAAAWEAAAdYAAAAgQD////8AgAAAAb7AAAAKABQAEwAVQBHAEkATgAyADMAOQAzADAANQA3ADQAMAAxADcANQA4ADgAAAAAFgAAAKQAAAAAAAAAAPsAAABIADMAMQA5ADkAMAA5ADUAYgAtADgAMAA0ADYALQA0AGEAZQA4AC0AOAA2AGMAMgAtAGQAMwA2AGQAMAA5AGIAOQBiADMAMQBlAAAAABYAAAJ1AAAAAAAAAAD7AAAASABkADYAMQBlADUAYgAwAGEALQBmAGYAMAA1AC0ANAA1ADQAMwAtAGEANQBiADEALQA1ADAAMQBkADYAYQAwADIAMQAwAGYANQEAAAAWAAAB0AAAAFAA////+wAAAEgAOABmADUAOQBhADMAZgBlAC0AZQA2ADYAZAAtADQAYgA4ADYALQA5AGYANQBlAC0AMgBkAGYAYgA2ADUAOQA1AGIAZQBjADABAAAB6gAAA28AAABkAP////sAAAAoAFAATABVAEcASQBOADQAMQAwADMAMQA0ADEANwAyADEAMAA2ADUANwEAAAFQAAADIQAAAAAAAAAA/AAAAUYAAAMrAAAAAAD////6AAAAAAEAAAAF+wAAACYAUABMAFUARwBJAE4AMQA5ADEANAA3ADcANgAzADEANAAwADgAOAEAAAAA/////wAAAAAAAAAA+wAAACoAUABMAFUARwBJAE4AMgAyADQANwA3ADIAMwA1ADgAMgAxADAANAA4ADEAAAAAAP////8AAAAAAAAAAPsAAAAmAFAATABVAEcASQBOADEAMAA0ADIAMgA2ADEANwA0ADgANQA5ADAAAAAAAP////8AAAAAAAAAAPsAAAAqAFAATABVAEcASQBOADIANAA3ADYAMwAxADAAOAAxADkAMwAyADIANAA4AAAAAAD/////AAAAAAAAAAD7AAAAKgBQAEwAVQBHAEkATgAzADAAMwAwADUAMwAyADUAOAAyADMAMgA2ADcANwAAAAGdAAAF4wAAAAAAAAAA/AAACL0AAAFDAAAAhAD////8AgAAAAr7AAAANABHAHIAYQBwAGgAUABsAHUAZwBpAG4AOgA6AFAAYQBsAGUAdAB0AGUAVwBpAGQAZwBlAHQBAAAByQAAAH4AAAAAAAAAAPsAAAA6AEcAcgBhAHAAaABQAGwAdQBnAGkAbgA6ADoAQQB0AHQAcgBpAGIAdQB0AGUAcwBXAGkAZABnAGUAdAEAAAJLAAAApQAAAAAAAAAA/AAAABYAAAVDAAAAXAD////8AQAAAAL7AAAAKgBQAEwAVQBHAEkATgAyADEANgAxADYAMgAwADIANAA3ADEAMwA0ADQANQAAAAYjAAAAvwAAAAAAAAAA+wAAAEgAOABhAGUAYgBlADMANQBiAC0ANgA2AGUAMQAtADQAYwBkADAALQA4ADMANQBhAC0AZgBkADMANgAzADcAZQA0ADMAMgA1AGEBAAAIvQAAAUMAAACEAP////sAAAA2AEcAcgBhAHAAaABQAGwAdQBnAGkAbgA6ADoAUgBlAHMAbwB1AHIAYwBlAFcAaQBkAGcAZQB0AQAAA5cAAADaAAAAAAAAAAD7AAAAKgBQAEwAVQBHAEkATgAyADEANgAzADEAMwAwADUAMQAyADIAOQA0ADQAMQEAAAI5AAAAdgAAAAAAAAAA+wAAAD4AQwBsAGEAcwBzAGkAZgBpAGUAcgBQAGwAdQBnAGkAbgA6ADoAUABhAGwAZQB0AHQAZQBXAGkAZABnAGUAdAEAAAJUAAAAggAAAAAAAAAA+wAAAEQAQwBsAGEAcwBzAGkAZgBpAGUAcgBQAGwAdQBnAGkAbgA6ADoAQQB0AHQAcgBpAGIAdQB0AGUAcwBXAGkAZABnAGUAdAEAAALaAAAAxAAAAAAAAAAA+wAAAEAAQwBsAGEAcwBzAGkAZgBpAGUAcgBQAGwAdQBnAGkAbgA6ADoAUgBlAHMAbwB1AHIAYwBlAFcAaQBkAGcAZQB0AQAAA6IAAADPAAAAAAAAAAD7AAAAOABDAGwAYQBzAHMAaQBmAGkAZQByAFAAbAB1AGcAaQBuADoAOgBBAHQAdAByAGkAYgB1AHQAZQBzAQAAAZgAAAFJAAAAAAAAAAD7AAAANgBDAGwAYQBzAHMAaQBmAGkAZQByAFAAbAB1AGcAaQBuADoAOgBSAGUAcwBvAHUAcgBjAGUAcwEAAALlAAAA9gAAAAAAAAAA+wAAACgAUABMAFUARwBJAE4AMQA3ADYAMAAxADkANgA5ADMAMQA3ADcAMQA5AgAABJwAAAA9AAAB9AAAAkIAAAoAAAAAAAAAAAQAAAAEAAAACAAAAAj8AAAAAA=="
     },
     "plugins": [
         {
@@ -64,14 +64,6 @@
                     "internalName": "timeRange",
                     "value": 10.0
                 },
-                {
-                    "internalName": "rangeMin",
-                    "value": 0.0
-                },
-                {
-                    "internalName": "rangeMax",
-                    "value": 1.0
-                },
                 {
                     "internalName": "style",
                     "value": 4