100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Added new manufacturer realm to demo setup (#955)
DonWillems0670688f3bc3
diff --git a/deployment/manager/app/images/logo-mobile_manufacturer.svg b/deployment/manager/app/images/logo-mobile_manufacturer.svgnew file mode 100644index 000000000..0cf261fca--- /dev/null+++ b/deployment/manager/app/images/logo-mobile_manufacturer.svg@@ -0,0 +1,23 @@+<?xml version="1.0" encoding="UTF-8"?>+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40">+ <defs>+ <style>+ .cls-1 {+ fill: #1a5632;+ }++ .cls-2 {+ fill: #4c9c2e;+ }++ .cls-3 {+ fill: #29abe2;+ }+ </style>+ </defs>+ <g>+ <path class="cls-2" d="M31.57,12.67c2.97,3.09,4.56,7.16,4.47,11.44-.09,4.29-1.84,8.28-4.93,11.25-3.09,2.97-7.16,4.56-11.44,4.47-4.29-.09-8.28-1.84-11.25-4.93-6.13-6.38-5.92-16.56,.46-22.69l3.14,3.27c-4.58,4.4-4.73,11.7-.33,16.28,2.13,2.22,5,3.48,8.07,3.54,3.07,.06,5.99-1.08,8.21-3.21,2.22-2.13,3.47-5,3.54-8.07,.06-3.07-1.07-5.99-3.21-8.21l3.27-3.14h0Z"/>+ <path class="cls-1" d="M12.82,31.37c-.13-.12-.25-.24-.37-.37-1.91-2.02-2.92-4.66-2.85-7.44,.07-2.78,1.22-5.36,3.24-7.27l3.12,3.29c-1.14,1.08-1.79,2.54-1.83,4.11-.04,1.57,.53,3.06,1.61,4.2,1.08,1.13,2.54,1.79,4.1,1.83,1.57,.04,3.06-.53,4.2-1.61,2.35-2.23,2.45-5.95,.22-8.3l3.29-3.12c3.95,4.17,3.77,10.76-.39,14.71-2.02,1.91-4.66,2.92-7.44,2.85-2.6-.07-5.03-1.08-6.9-2.87h0Z"/>+ </g>+ <path class="cls-3" d="M20.25,16.05c-1.01,0-1.95-.25-2.8-.76-.85-.51-1.53-1.19-2.02-2.04-.49-.85-.74-1.77-.74-2.76,0-.87,.29-1.91,.87-3.13,.46-.98,1.1-2.07,1.91-3.26,.58-.84,1.22-1.69,1.91-2.56l.87-1.04,.87,1.04c.69,.87,1.33,1.72,1.91,2.56,.81,1.19,1.45,2.27,1.91,3.26,.58,1.22,.87,2.26,.87,3.13,0,.98-.25,1.9-.74,2.76-.49,.85-1.17,1.54-2.02,2.04-.85,.51-1.79,.76-2.8,.76Z"/>+</svg>\ No newline at end of filediff --git a/deployment/manager/app/images/logo-mobile_smartcity.svg b/deployment/manager/app/images/logo-mobile_smartcity.svgnew file mode 100644index 000000000..40a93f7fe--- /dev/null+++ b/deployment/manager/app/images/logo-mobile_smartcity.svg@@ -0,0 +1,26 @@+<?xml version="1.0" encoding="UTF-8"?>+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40">+ <defs>+ <style>+ .cls-1 {+ fill: #fff;+ }++ .cls-2 {+ fill: #662d91;+ }++ .cls-3 {+ fill: #2e3192;+ }++ .cls-4 {+ fill: #93278f;+ }+ </style>+ </defs>+ <path class="cls-3" d="M34.14,36.66c3.52-3.58,5.7-8.48,5.7-13.9,0-10.95-8.88-19.83-19.83-19.83S.17,11.81,.17,22.76c0,5.42,2.18,10.32,5.7,13.9h28.28Z"/>+ <path class="cls-2" d="M15.69,36.66h8.62c5.93-1.84,10.24-7.37,10.24-13.9,0-8.04-6.51-14.55-14.55-14.55S5.45,14.73,5.45,22.76c0,6.53,4.31,12.06,10.24,13.9Z"/>+ <circle class="cls-4" cx="20" cy="22.76" r="9.27"/>+ <path class="cls-1" d="M31.79,23.83v13.24H7.93V18.49h7.95v-2.61l3.98-3.98,3.98,3.98v7.95h7.95Zm-18.58-2.67h-2.61v2.67h2.61v-2.67Zm0,5.28h-2.61v2.67h2.61v-2.67Zm0,5.34h-2.61v2.61h2.61v-2.61Zm7.95-15.91h-2.61v2.61h2.61v-2.61Zm0,5.28h-2.61v2.67h2.61v-2.67Zm0,5.28h-2.61v2.67h2.61v-2.67Zm0,5.34h-2.61v2.61h2.61v-2.61Zm7.95-5.34h-2.61v2.67h2.61v-2.67Zm0,5.34h-2.61v2.61h2.61v-2.61Z"/>+</svg>\ No newline at end of filediff --git a/deployment/manager/app/images/logo_manufacturer.svg b/deployment/manager/app/images/logo_manufacturer.svgnew file mode 100644index 000000000..1226b699c--- /dev/null+++ b/deployment/manager/app/images/logo_manufacturer.svg@@ -0,0 +1,47 @@+<?xml version="1.0" encoding="UTF-8"?>+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 163.56 50">+ <defs>+ <style>+ .cls-1 {+ fill: #1a5632;+ }++ .cls-2 {+ fill: #4c9c2e;+ }++ .cls-3 {+ fill: #29abe2;+ }++ .cls-4 {+ fill: #c2d500;+ }+ </style>+ </defs>+ <g>+ <path class="cls-2" d="M68.4,22.04c-.53,.32-1.13,.58-1.81,.76s-1.43,.28-2.25,.28c-1.77,0-3.17-.47-4.22-1.41-1.05-.94-1.57-2.34-1.57-4.21,0-1.71,.54-3.14,1.61-4.27,1.07-1.13,2.55-1.7,4.43-1.7,.7,0,1.34,.06,1.94,.18,.6,.12,1.21,.32,1.83,.59l-.79,1.89c-.5-.22-.98-.38-1.45-.47-.46-.1-.98-.14-1.54-.14-1.06,0-1.91,.32-2.53,.96s-.94,1.59-.94,2.84,.31,2.19,.92,2.79c.61,.6,1.42,.9,2.42,.9,.31,0,.59-.02,.84-.07s.47-.12,.66-.2v-2.26h-2.26v-1.96h4.7v5.5Z"/>+ <path class="cls-2" d="M75.95,16.68c-.1-.03-.21-.05-.32-.06s-.23-.02-.36-.02c-.65,0-1.14,.21-1.47,.62-.33,.41-.5,.99-.5,1.72v3.94h-2.39V14.69h2.39v1.53h.03c.19-.56,.47-.98,.84-1.25,.36-.28,.81-.42,1.33-.42,.12,0,.25,0,.36,.02s.24,.04,.36,.06l-.27,2.05Z"/>+ <path class="cls-2" d="M85.17,19.46h-5.4c.04,.63,.25,1.1,.62,1.42,.37,.32,.88,.47,1.53,.47,.24,0,.57-.07,.98-.21s.82-.36,1.21-.65l1.04,1.39c-.56,.42-1.12,.72-1.7,.92s-1.22,.29-1.91,.29c-1.31,0-2.32-.37-3.05-1.1-.72-.73-1.09-1.76-1.09-3.08s.38-2.38,1.15-3.2,1.73-1.23,2.91-1.23,2.04,.34,2.71,1.03c.67,.69,1,1.68,1,2.97v.97Zm-2.22-1.5c0-.65-.13-1.11-.38-1.4-.26-.29-.63-.43-1.12-.43-.43,0-.8,.17-1.11,.5-.31,.33-.5,.78-.57,1.34h3.19Z"/>+ <path class="cls-2" d="M94.52,19.46h-5.4c.04,.63,.25,1.1,.62,1.42,.37,.32,.88,.47,1.53,.47,.24,0,.57-.07,.98-.21s.82-.36,1.21-.65l1.04,1.39c-.56,.42-1.12,.72-1.7,.92s-1.22,.29-1.91,.29c-1.31,0-2.32-.37-3.05-1.1-.72-.73-1.09-1.76-1.09-3.08s.38-2.38,1.15-3.2,1.73-1.23,2.91-1.23,2.04,.34,2.71,1.03c.67,.69,1,1.68,1,2.97v.97Zm-2.22-1.5c0-.65-.13-1.11-.38-1.4-.26-.29-.63-.43-1.12-.43-.43,0-.8,.17-1.11,.5-.31,.33-.5,.78-.57,1.34h3.19Z"/>+ <path class="cls-2" d="M104.37,22.89h-2.38v-4.57c0-.66-.12-1.16-.36-1.49-.24-.33-.59-.5-1.07-.5s-.84,.18-1.14,.53c-.3,.35-.45,.8-.45,1.35v4.67h-2.39V14.69h2.39v1.3h.03c.3-.5,.67-.88,1.11-1.13,.44-.25,.95-.38,1.53-.38,.91,0,1.59,.28,2.04,.85,.46,.57,.68,1.41,.68,2.53v5.02Z"/>+ <path class="cls-2" d="M116.75,22.89h-2.45v-4.6h-4.72v4.6h-2.44V11.68h2.44v4.5h4.72v-4.5h2.45v11.2Z"/>+ <path class="cls-2" d="M123.52,23.09c-1.35,0-2.41-.39-3.19-1.16-.78-.77-1.16-1.81-1.16-3.11,0-1.36,.41-2.42,1.21-3.19,.8-.77,1.89-1.15,3.26-1.15s2.4,.38,3.16,1.14,1.15,1.78,1.15,3.05c0,1.35-.4,2.42-1.19,3.21-.79,.79-1.88,1.19-3.25,1.19Zm.09-1.84c.64,0,1.11-.21,1.43-.63,.32-.42,.48-1.05,.48-1.88s-.16-1.39-.48-1.79-.8-.61-1.44-.61-1.11,.22-1.46,.65c-.35,.43-.52,1.04-.52,1.81s.17,1.42,.5,1.84,.83,.62,1.5,.62Z"/>+ <path class="cls-2" d="M137.81,22.89h-2.38v-1.26h-.04c-.31,.48-.67,.85-1.09,1.09-.42,.25-.89,.37-1.43,.37-.95,0-1.67-.29-2.14-.86-.47-.58-.71-1.44-.71-2.59v-4.95h2.38v4.72c0,.61,.12,1.07,.36,1.38,.24,.31,.6,.46,1.09,.46s.86-.17,1.15-.5c.29-.34,.43-.79,.43-1.36v-4.69h2.38v8.2Z"/>+ <path class="cls-2" d="M139.7,22.2l.99-1.6c.28,.21,.61,.39,.98,.54,.37,.15,.79,.22,1.25,.22,.35,0,.63-.06,.86-.19,.22-.13,.33-.32,.33-.58,0-.21-.09-.37-.26-.5s-.49-.24-.95-.34c-1.02-.22-1.75-.52-2.19-.92-.44-.39-.66-.94-.66-1.64,0-.82,.33-1.48,.98-1.97,.65-.49,1.46-.73,2.41-.73,.49,0,.95,.06,1.39,.19,.44,.13,.85,.32,1.24,.57l-.9,1.55c-.33-.21-.64-.36-.93-.46s-.59-.14-.89-.14c-.35,0-.64,.07-.85,.2-.21,.14-.32,.31-.32,.52,0,.23,.1,.41,.29,.52s.57,.23,1.12,.34c.94,.2,1.62,.5,2.04,.9s.62,.95,.62,1.65c0,.83-.31,1.49-.94,2s-1.45,.75-2.48,.75c-.57,0-1.11-.07-1.62-.21-.51-.14-1.02-.37-1.52-.67Z"/>+ <path class="cls-2" d="M155.49,19.46h-5.4c.04,.63,.25,1.1,.62,1.42,.37,.32,.88,.47,1.53,.47,.24,0,.57-.07,.98-.21s.82-.36,1.21-.65l1.04,1.39c-.56,.42-1.12,.72-1.7,.92s-1.22,.29-1.91,.29c-1.31,0-2.32-.37-3.05-1.1-.72-.73-1.09-1.76-1.09-3.08s.38-2.38,1.15-3.2,1.73-1.23,2.91-1.23,2.04,.34,2.71,1.03c.67,.69,1,1.68,1,2.97v.97Zm-2.22-1.5c0-.65-.13-1.11-.38-1.4-.26-.29-.63-.43-1.12-.43-.43,0-.8,.17-1.11,.5-.31,.33-.5,.78-.57,1.34h3.19Z"/>+ <path class="cls-3" d="M58.38,37.13l1.01-1.91c.56,.34,1.05,.57,1.48,.69s.86,.18,1.33,.18c.6,0,1.05-.12,1.35-.36,.3-.24,.45-.57,.45-.99,0-.39-.12-.69-.36-.91-.24-.22-.67-.4-1.3-.55-1.24-.29-2.14-.7-2.7-1.22s-.84-1.25-.84-2.18,.36-1.74,1.09-2.4,1.75-.99,3.06-.99c.55,0,1.08,.06,1.61,.19,.53,.12,1.04,.31,1.52,.55l-.93,1.92c-.43-.24-.83-.41-1.21-.52s-.74-.16-1.07-.16c-.52,0-.92,.1-1.21,.31s-.43,.5-.43,.89c0,.35,.13,.62,.39,.8,.26,.19,.74,.36,1.42,.53,1.2,.28,2.07,.69,2.61,1.24,.54,.54,.8,1.31,.8,2.29,0,1.05-.37,1.91-1.11,2.56-.74,.65-1.81,.98-3.21,.98-.63,0-1.28-.08-1.94-.25s-1.26-.4-1.79-.7Z"/>+ <path class="cls-3" d="M75.79,29.69l-3.68,9.7c-.28,.74-.7,1.31-1.25,1.72s-1.22,.61-2,.61c-.25,0-.49-.01-.73-.04-.24-.03-.46-.07-.68-.13l.41-1.78c.12,.05,.25,.09,.37,.11,.12,.02,.26,.04,.4,.04,.27,0,.5-.07,.7-.2,.2-.13,.36-.34,.48-.63l.52-1.22-3.32-8.18h2.64l1.61,5.14c.05,.14,.09,.3,.12,.47,.04,.17,.07,.36,.09,.57h.03c.03-.15,.06-.31,.11-.48,.04-.17,.09-.35,.15-.55l1.64-5.16h2.37Z"/>+ <path class="cls-3" d="M76.59,37.2l.99-1.6c.28,.21,.61,.39,.98,.54,.37,.15,.79,.22,1.25,.22,.35,0,.63-.06,.86-.19,.22-.13,.33-.32,.33-.58,0-.21-.09-.37-.26-.5s-.49-.24-.95-.34c-1.02-.22-1.75-.52-2.19-.92-.44-.39-.66-.94-.66-1.64,0-.82,.33-1.48,.98-1.97,.65-.49,1.46-.73,2.41-.73,.49,0,.95,.06,1.39,.19,.44,.13,.85,.32,1.24,.57l-.9,1.55c-.33-.21-.64-.36-.93-.46s-.59-.14-.89-.14c-.35,0-.64,.07-.85,.2-.21,.14-.32,.31-.32,.52,0,.23,.1,.41,.29,.52s.57,.23,1.12,.34c.94,.2,1.62,.5,2.04,.9s.62,.95,.62,1.65c0,.83-.31,1.49-.94,2s-1.45,.75-2.48,.75c-.57,0-1.11-.07-1.62-.21-.51-.14-1.02-.37-1.52-.67Z"/>+ <path class="cls-3" d="M90.11,37.75c-.25,.11-.53,.19-.83,.25s-.62,.08-.93,.08c-.88,0-1.54-.21-1.98-.64s-.67-1.06-.67-1.91v-4.08h-1.34v-1.77h1.34v-1.84l2.38-.69v2.53h1.87v1.77h-1.87v3.91c0,.33,.06,.58,.2,.73,.13,.15,.33,.23,.6,.23,.14,0,.27-.02,.4-.05s.24-.08,.36-.14l.48,1.62Z"/>+ <path class="cls-3" d="M99.22,34.46h-5.4c.04,.63,.25,1.1,.62,1.42,.37,.32,.88,.47,1.53,.47,.24,0,.57-.07,.98-.21s.82-.36,1.21-.65l1.04,1.39c-.56,.42-1.12,.72-1.7,.92s-1.22,.29-1.91,.29c-1.31,0-2.32-.37-3.05-1.1-.72-.73-1.09-1.76-1.09-3.08s.38-2.38,1.15-3.2,1.73-1.23,2.91-1.23,2.04,.34,2.71,1.03c.67,.69,1,1.68,1,2.97v.97Zm-2.22-1.5c0-.65-.13-1.11-.38-1.4-.26-.29-.63-.43-1.12-.43-.43,0-.8,.17-1.11,.5-.31,.33-.5,.78-.57,1.34h3.19Z"/>+ <path class="cls-3" d="M114.13,37.89h-2.38v-4.68c0-.64-.11-1.11-.34-1.41s-.57-.46-1.04-.46c-.43,0-.79,.19-1.06,.56-.28,.38-.41,.84-.41,1.4v4.59h-2.38v-4.74c0-.61-.11-1.06-.34-1.36-.23-.3-.57-.45-1.02-.45s-.82,.18-1.09,.54c-.27,.36-.41,.84-.41,1.45v4.57h-2.39v-8.2h2.39v1.28h.03c.27-.45,.63-.81,1.1-1.08,.47-.27,.98-.41,1.54-.41s1.06,.13,1.46,.39c.4,.26,.7,.65,.91,1.16,.31-.52,.7-.91,1.16-1.16,.46-.25,.99-.38,1.59-.38,.89,0,1.56,.27,2.01,.82,.45,.55,.67,1.38,.67,2.48v5.09Z"/>+ <path class="cls-3" d="M115.9,37.2l.99-1.6c.28,.21,.61,.39,.98,.54,.37,.15,.79,.22,1.25,.22,.35,0,.63-.06,.86-.19,.22-.13,.33-.32,.33-.58,0-.21-.09-.37-.26-.5s-.49-.24-.95-.34c-1.02-.22-1.75-.52-2.19-.92-.44-.39-.66-.94-.66-1.64,0-.82,.33-1.48,.98-1.97,.65-.49,1.46-.73,2.41-.73,.49,0,.95,.06,1.39,.19,.44,.13,.85,.32,1.24,.57l-.9,1.55c-.33-.21-.64-.36-.93-.46s-.59-.14-.89-.14c-.35,0-.64,.07-.85,.2-.21,.14-.32,.31-.32,.52,0,.23,.1,.41,.29,.52s.57,.23,1.12,.34c.94,.2,1.62,.5,2.04,.9s.62,.95,.62,1.65c0,.83-.31,1.49-.94,2s-1.45,.75-2.48,.75c-.57,0-1.11-.07-1.62-.21-.51-.14-1.02-.37-1.52-.67Z"/>+ </g>+ <path class="cls-4" d="M-8.71-32.53C4.7-18.61,4.3,3.62-9.62,17.04l-5.09-5.29C-3.71,1.15-3.39-16.43-13.99-27.43c-10.6-11-28.18-11.33-39.19-.72-11,10.6-11.33,28.18-.72,39.18l-5.28,5.09c-13.41-13.92-13-36.15,.91-49.56,13.92-13.41,36.15-13,49.56,.92h0Z"/>+ <g>+ <path class="cls-2" d="M47.68,18.95c2.46,2.56,3.77,5.93,3.7,9.48-.07,3.55-1.52,6.86-4.09,9.32-2.56,2.46-5.93,3.77-9.48,3.7-3.55-.07-6.86-1.52-9.32-4.09-5.08-5.29-4.91-13.72,.38-18.8l2.6,2.71c-3.79,3.64-3.92,9.69-.27,13.49,1.77,1.84,4.14,2.88,6.69,2.93,2.55,.05,4.96-.89,6.8-2.66,1.84-1.77,2.88-4.14,2.93-6.69,.05-2.55-.89-4.96-2.66-6.8l2.71-2.6h0Z"/>+ <path class="cls-1" d="M32.14,34.44c-.11-.1-.21-.2-.31-.31-1.58-1.67-2.42-3.86-2.36-6.16,.06-2.3,1.01-4.44,2.69-6.03l2.58,2.73c-.94,.89-1.48,2.1-1.52,3.4-.04,1.3,.44,2.53,1.33,3.48,.89,.94,2.1,1.48,3.4,1.52,1.3,.04,2.53-.44,3.48-1.33,1.95-1.84,2.03-4.93,.18-6.88l2.73-2.58c3.27,3.45,3.12,8.92-.33,12.19-1.67,1.58-3.86,2.42-6.16,2.36-2.16-.06-4.17-.9-5.72-2.38h0Z"/>+ </g>+ <path class="cls-3" d="M38.05,21.75c-.84,0-1.61-.21-2.32-.63-.71-.42-1.27-.98-1.67-1.69-.41-.71-.61-1.47-.61-2.29,0-.72,.24-1.58,.72-2.59,.38-.82,.91-1.72,1.58-2.7,.48-.7,1.01-1.4,1.58-2.12l.72-.86,.72,.86c.58,.72,1.1,1.43,1.58,2.12,.67,.98,1.2,1.88,1.58,2.7,.48,1.01,.72,1.87,.72,2.59,0,.82-.2,1.58-.61,2.29-.41,.71-.97,1.27-1.67,1.69-.71,.42-1.48,.63-2.32,.63Z"/>+</svg>\ No newline at end of filediff --git a/deployment/manager/app/images/logo_smartcity.svg b/deployment/manager/app/images/logo_smartcity.svgnew file mode 100644index 000000000..85f9a1543--- /dev/null+++ b/deployment/manager/app/images/logo_smartcity.svg@@ -0,0 +1,50 @@+<?xml version="1.0" encoding="UTF-8"?>+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 162.89 50">+ <defs>+ <style>+ .cls-1 {+ fill: #fff;+ }++ .cls-2 {+ fill: #662d91;+ }++ .cls-3 {+ fill: #2e3192;+ }++ .cls-4 {+ fill: #1b1464;+ }++ .cls-5 {+ fill: #93278f;+ }+ </style>+ </defs>+ <path class="cls-3" d="M148.72,42.33c3.61-3.67,5.84-8.7,5.84-14.25,0-11.23-9.1-20.33-20.33-20.33s-20.33,9.1-20.33,20.33c0,5.55,2.23,10.58,5.84,14.25h28.99Z"/>+ <path class="cls-2" d="M129.8,42.33h8.84c6.08-1.88,10.5-7.55,10.5-14.25,0-8.24-6.68-14.92-14.92-14.92s-14.92,6.68-14.92,14.92c0,6.7,4.42,12.37,10.5,14.25Z"/>+ <g>+ <path class="cls-5" d="M32.17,24.11h-2.77l-1.52-2.79c-.25-.45-.49-.79-.73-1.02s-.53-.36-.84-.38h-.72v4.2h-2.44V12.9h3.95c1.34,0,2.35,.26,3.02,.79s1.02,1.32,1.02,2.38c0,.75-.22,1.39-.65,1.93s-1.03,.94-1.79,1.2v.03c.32,.1,.63,.32,.91,.64s.52,.66,.72,1.02l1.84,3.23Zm-6.59-9.36v3.3h1.14c.55,0,1-.17,1.33-.5s.5-.75,.5-1.24-.15-.91-.45-1.17-.75-.39-1.34-.39h-1.19Z"/>+ <path class="cls-5" d="M37.21,24.31c-1.35,0-2.41-.39-3.19-1.16-.78-.77-1.16-1.81-1.16-3.11,0-1.36,.41-2.42,1.21-3.19,.8-.77,1.89-1.15,3.26-1.15s2.4,.38,3.16,1.14,1.15,1.78,1.15,3.05c0,1.35-.4,2.42-1.19,3.21-.79,.79-1.88,1.19-3.25,1.19Zm.09-1.84c.63,0,1.11-.21,1.43-.63,.32-.42,.48-1.05,.48-1.88s-.16-1.39-.48-1.79-.8-.61-1.44-.61-1.11,.22-1.46,.65c-.35,.43-.52,1.04-.52,1.81s.17,1.42,.5,1.84,.83,.62,1.5,.62Z"/>+ <path class="cls-5" d="M48.84,23.98c-.25,.11-.53,.19-.83,.25s-.62,.08-.93,.08c-.88,0-1.54-.21-1.98-.64s-.67-1.06-.67-1.91v-4.08h-1.34v-1.77h1.34v-1.84l2.38-.69v2.53h1.87v1.77h-1.87v3.91c0,.33,.07,.58,.2,.73s.33,.23,.6,.23c.14,0,.27-.02,.4-.05s.25-.08,.36-.14l.48,1.62Z"/>+ <path class="cls-5" d="M55.68,23.98c-.25,.11-.53,.19-.83,.25s-.62,.08-.93,.08c-.88,0-1.54-.21-1.98-.64s-.67-1.06-.67-1.91v-4.08h-1.34v-1.77h1.34v-1.84l2.38-.69v2.53h1.87v1.77h-1.87v3.91c0,.33,.07,.58,.2,.73s.33,.23,.6,.23c.14,0,.27-.02,.4-.05s.25-.08,.36-.14l.48,1.62Z"/>+ <path class="cls-5" d="M64.79,20.68h-5.4c.04,.63,.25,1.1,.62,1.42,.37,.32,.88,.47,1.53,.47,.24,0,.57-.07,.98-.21s.82-.36,1.21-.65l1.04,1.39c-.56,.42-1.12,.72-1.7,.92s-1.22,.29-1.91,.29c-1.31,0-2.32-.37-3.05-1.1-.72-.73-1.09-1.76-1.09-3.08s.38-2.38,1.15-3.2,1.73-1.23,2.91-1.23,2.04,.34,2.71,1.03c.67,.69,1,1.68,1,2.97v.97Zm-2.22-1.5c0-.65-.13-1.11-.38-1.4-.26-.29-.63-.43-1.12-.43-.43,0-.8,.17-1.11,.5-.31,.33-.5,.78-.57,1.34h3.19Z"/>+ <path class="cls-5" d="M71.89,17.9c-.1-.03-.21-.05-.32-.06s-.23-.02-.36-.02c-.65,0-1.14,.21-1.47,.62s-.5,.99-.5,1.72v3.94h-2.39V15.91h2.39v1.53h.03c.19-.56,.47-.98,.84-1.25s.81-.42,1.33-.42c.12,0,.25,0,.36,.02s.24,.04,.36,.06l-.27,2.05Z"/>+ <path class="cls-5" d="M79.32,22.95c-.29,.45-.65,.79-1.08,1.02-.43,.23-.92,.34-1.49,.34-1.02,0-1.84-.36-2.47-1.09s-.94-1.74-.94-3.03c0-1.36,.34-2.45,1.04-3.26,.69-.82,1.59-1.22,2.71-1.22,.53,0,.98,.1,1.35,.29s.67,.48,.88,.88h.03v-4.61h2.39v11.84h-2.39v-1.16h-.03Zm-3.55-2.84c0,.75,.16,1.34,.48,1.74,.32,.41,.76,.61,1.32,.61s.98-.21,1.32-.64,.5-.98,.5-1.68v-.68c0-.55-.16-1.01-.48-1.38-.32-.36-.74-.55-1.26-.55-.59,0-1.05,.23-1.38,.68-.33,.46-.5,1.08-.5,1.88Z"/>+ <path class="cls-5" d="M91.13,24.11h-2.27v-1.19h-.03c-.27,.46-.61,.8-1.02,1.04s-.88,.35-1.4,.35c-.73,0-1.34-.22-1.84-.66s-.75-1.04-.75-1.81,.25-1.39,.75-1.86,1.27-.78,2.32-.92l2.01-.27v-.16c0-.42-.13-.74-.39-.95s-.62-.32-1.08-.32c-.34,0-.72,.06-1.12,.18s-.82,.3-1.23,.56l-.84-1.41c.54-.33,1.08-.57,1.63-.73s1.14-.24,1.79-.24c1.19,0,2.07,.29,2.64,.86s.86,1.43,.86,2.59v4.95Zm-2.25-3.34v-.58l-1.55,.2c-.44,.06-.76,.18-.98,.38s-.32,.46-.32,.79c0,.3,.1,.55,.31,.74s.49,.29,.84,.29c.5,0,.91-.17,1.22-.51s.47-.78,.47-1.31Z"/>+ <path class="cls-5" d="M106.53,24.11h-2.38v-4.68c0-.64-.11-1.11-.34-1.41s-.57-.46-1.04-.46c-.43,0-.79,.19-1.06,.56s-.41,.84-.41,1.4v4.59h-2.38v-4.74c0-.61-.11-1.06-.34-1.36s-.57-.45-1.02-.45-.82,.18-1.09,.54-.41,.84-.41,1.45v4.57h-2.39V15.91h2.39v1.28h.03c.27-.45,.63-.81,1.1-1.08s.98-.41,1.54-.41,1.07,.13,1.46,.39,.7,.65,.91,1.16c.31-.52,.7-.91,1.16-1.16s.99-.38,1.59-.38c.89,0,1.56,.27,2.01,.82s.67,1.38,.67,2.48v5.09Z"/>+ <path class="cls-4" d="M22.27,37.35l1.01-1.91c.56,.34,1.05,.57,1.48,.69s.86,.18,1.33,.18c.6,0,1.05-.12,1.35-.36s.45-.57,.45-.99c0-.39-.12-.69-.36-.91s-.67-.4-1.3-.55c-1.24-.29-2.14-.7-2.7-1.22s-.84-1.25-.84-2.18,.36-1.74,1.09-2.4,1.75-.99,3.06-.99c.55,0,1.08,.06,1.61,.19s1.04,.31,1.52,.55l-.93,1.92c-.43-.24-.83-.41-1.21-.52s-.74-.16-1.07-.16c-.52,0-.92,.1-1.21,.31s-.43,.5-.43,.89c0,.35,.13,.62,.39,.8s.74,.36,1.42,.53c1.2,.28,2.07,.69,2.61,1.24s.8,1.31,.8,2.29c0,1.05-.37,1.91-1.11,2.56s-1.81,.98-3.21,.98c-.63,0-1.28-.08-1.94-.25s-1.26-.4-1.79-.7Z"/>+ <path class="cls-4" d="M45.3,38.11h-2.38v-4.68c0-.64-.11-1.11-.34-1.41s-.57-.46-1.04-.46c-.43,0-.79,.19-1.06,.56-.28,.38-.41,.84-.41,1.4v4.59h-2.38v-4.74c0-.61-.12-1.06-.34-1.36-.23-.3-.57-.45-1.02-.45s-.82,.18-1.09,.54c-.27,.36-.41,.84-.41,1.45v4.57h-2.39v-8.2h2.39v1.28h.03c.27-.45,.63-.81,1.1-1.08,.47-.27,.98-.41,1.54-.41s1.06,.13,1.46,.39c.4,.26,.7,.65,.91,1.16,.31-.52,.7-.91,1.16-1.16,.46-.25,.99-.38,1.59-.38,.89,0,1.56,.27,2.01,.82,.45,.55,.67,1.38,.67,2.48v5.09Z"/>+ <path class="cls-4" d="M54.57,38.11h-2.27v-1.19h-.03c-.27,.46-.61,.8-1.02,1.04s-.88,.35-1.4,.35c-.73,0-1.34-.22-1.84-.66s-.75-1.04-.75-1.81,.25-1.39,.75-1.86,1.27-.78,2.32-.92l2.01-.27v-.16c0-.42-.13-.74-.39-.95s-.62-.32-1.08-.32c-.34,0-.72,.06-1.12,.18s-.82,.3-1.23,.56l-.84-1.41c.54-.33,1.08-.57,1.63-.73s1.14-.24,1.79-.24c1.19,0,2.07,.29,2.64,.86s.86,1.43,.86,2.59v4.95Zm-2.25-3.34v-.58l-1.55,.2c-.44,.06-.76,.18-.98,.38s-.32,.46-.32,.79c0,.3,.1,.55,.31,.74s.49,.29,.84,.29c.5,0,.91-.17,1.22-.51s.47-.78,.47-1.31Z"/>+ <path class="cls-4" d="M62.15,31.9c-.1-.03-.21-.05-.32-.06s-.23-.02-.36-.02c-.65,0-1.14,.21-1.47,.62s-.5,.99-.5,1.72v3.94h-2.39v-8.2h2.39v1.53h.03c.19-.56,.47-.98,.84-1.25s.81-.42,1.33-.42c.12,0,.25,0,.36,.02s.24,.04,.36,.06l-.27,2.05Z"/>+ <path class="cls-4" d="M69.1,37.98c-.25,.11-.53,.19-.83,.25s-.62,.08-.93,.08c-.88,0-1.54-.21-1.98-.64s-.67-1.06-.67-1.91v-4.08h-1.34v-1.77h1.34v-1.84l2.38-.69v2.53h1.87v1.77h-1.87v3.91c0,.33,.06,.58,.2,.73,.13,.15,.33,.23,.6,.23,.14,0,.27-.02,.4-.05s.24-.08,.36-.14l.48,1.62Z"/>+ <path class="cls-4" d="M84.4,37.52c-.59,.28-1.16,.48-1.72,.6-.56,.12-1.16,.18-1.8,.18-1.75,0-3.12-.49-4.11-1.47-1-.98-1.5-2.38-1.5-4.19,0-1.71,.54-3.12,1.64-4.25,1.09-1.12,2.53-1.68,4.31-1.68,.6,0,1.15,.05,1.63,.14,.48,.09,.97,.24,1.47,.43l-.75,1.98c-.38-.16-.74-.27-1.11-.34-.36-.07-.75-.1-1.17-.1-.94,0-1.75,.33-2.43,.98s-1.02,1.55-1.02,2.67,.3,2.05,.89,2.7c.6,.65,1.41,.98,2.45,.98,.3,0,.65-.05,1.06-.14,.41-.09,.83-.25,1.25-.46l.91,1.96Z"/>+ <path class="cls-4" d="M87.57,28.81c-.42,0-.76-.13-1.02-.38s-.39-.57-.39-.94,.13-.71,.39-.95,.6-.37,1.02-.37,.76,.12,1.02,.37,.39,.56,.39,.95-.13,.7-.39,.95-.6,.37-1.02,.37Zm1.17,9.3h-2.38v-8.2h2.38v8.2Z"/>+ <path class="cls-4" d="M96.53,37.98c-.25,.11-.53,.19-.83,.25s-.62,.08-.93,.08c-.88,0-1.54-.21-1.98-.64s-.67-1.06-.67-1.91v-4.08h-1.34v-1.77h1.34v-1.84l2.38-.69v2.53h1.87v1.77h-1.87v3.91c0,.33,.07,.58,.2,.73s.33,.23,.6,.23c.14,0,.27-.02,.4-.05s.25-.08,.36-.14l.48,1.62Z"/>+ <path class="cls-4" d="M106.06,29.91l-3.68,9.7c-.28,.74-.7,1.31-1.25,1.72s-1.22,.61-2,.61c-.25,0-.49-.01-.73-.04-.24-.03-.46-.07-.68-.13l.41-1.78c.12,.05,.25,.09,.37,.11,.12,.02,.26,.04,.4,.04,.27,0,.5-.07,.7-.2,.2-.13,.36-.34,.48-.63l.52-1.22-3.32-8.18h2.64l1.61,5.14c.05,.14,.09,.3,.12,.47,.04,.17,.07,.36,.09,.57h.03c.03-.15,.06-.31,.11-.48,.04-.17,.09-.35,.15-.55l1.64-5.16h2.37Z"/>+ </g>+ <circle class="cls-5" cx="134.22" cy="28.08" r="9.5"/>+ <path class="cls-1" d="M146.31,29.18v13.57h-24.46V23.7h8.15v-2.68l4.08-4.08,4.08,4.08v8.15h8.15Zm-19.05-2.74h-2.68v2.74h2.68v-2.74Zm0,5.42h-2.68v2.74h2.68v-2.74Zm0,5.48h-2.68v2.68h2.68v-2.68Zm8.15-16.31h-2.68v2.68h2.68v-2.68Zm0,5.42h-2.68v2.74h2.68v-2.74Zm0,5.42h-2.68v2.74h2.68v-2.74Zm0,5.48h-2.68v2.68h2.68v-2.68Zm8.15-5.48h-2.68v2.74h2.68v-2.74Zm0,5.48h-2.68v2.68h2.68v-2.68Z"/>+</svg>\ No newline at end of filediff --git a/deployment/manager/app/manager_config.json b/deployment/manager/app/manager_config.jsonindex 486123d64..e5186e272 100644--- a/deployment/manager/app/manager_config.json+++ b/deployment/manager/app/manager_config.json@@ -3,6 +3,181 @@"default": {"appTitle": "OpenRemote Manager Demo","language": "en"+ },+ "smartcity": {+ "styles": ":host > * {--or-app-color2: #F6F7FA; --or-app-color3: #1B1464; --or-app-color4: #662D91;}",+ "logo": "/images/logo_smartcity.svg",+ "logoMobile": "/images/logo-mobile_smartcity.svg"+ },+ "manufacturer": {+ "styles": ":host > * {--or-app-color2: #F6FAFA; --or-app-color3: #1A2456; --or-app-color4: #29ABE2;}",+ "logo": "/images/logo_manufacturer.svg",+ "logoMobile": "/images/logo-mobile_manufacturer.svg"+ }+ },+ "pages": {+ "assets": {+ "viewer": {+ "assetTypes": {+ "SoilSensorAsset": {+ "viewerStyles": {},+ "panels": [+ {+ "type": "group",+ "title": "underlyingAssets"+ },+ {+ "type": "info",+ "hideOnMobile": true,+ "properties": {+ "include": []+ },+ "attributes": {+ "include": ["notes"]+ }+ },+ {+ "type": "info",+ "column": 1,+ "title": "location",+ "properties": {+ "include": []+ },+ "attributes": {+ "include": [+ "location"+ ],+ "itemConfig": {+ "location": {+ "label": ""+ }+ }+ }+ },+ {+ "type": "info",+ "title": "Sensor Values",+ "properties": {+ "include": []+ },+ "attributes": {+ "include": [+ "salinity",+ "soilTensionMeasured",+ "temperature"+ ]+ }+ },+ {+ "type": "info",+ "title": "Settings",+ "properties": {+ "include": []+ },+ "attributes": {+ "include": [+ "soilTensionMin",+ "soilTensionMax"+ ]+ }+ },+ {+ "type": "history",+ "column": 1+ },+ {+ "type": "linkedUsers",+ "column": 1+ }+ ]+ },+ "HarvestRobotAsset": {+ "viewerStyles": {},+ "panels": [+ {+ "type": "group",+ "title": "underlyingAssets"+ },+ {+ "type": "info",+ "hideOnMobile": true,+ "properties": {+ "include": []+ },+ "attributes": {+ "include": ["notes"]+ }+ },+ {+ "type": "info",+ "column": 1,+ "title": "location",+ "properties": {+ "include": []+ },+ "attributes": {+ "include": [+ "location"+ ],+ "itemConfig": {+ "location": {+ "label": ""+ }+ }+ }+ },+ {+ "type": "info",+ "title": "Operation",+ "properties": {+ "include": []+ },+ "attributes": {+ "include": [+ "operationMode",+ "speed",+ "direction"+ ]+ }+ },+ {+ "type": "info",+ "column": 1,+ "title": "Settings",+ "properties": {+ "include": []+ },+ "attributes": {+ "include": [+ "vegetableType"+ ]+ }+ },+ {+ "type": "info",+ "title": "Harvested",+ "properties": {+ "include": []+ },+ "attributes": {+ "include": [+ "harvestedSession",+ "harvestedTotal"+ ]+ }+ },+ {+ "type": "history",+ "column": 1+ },+ {+ "type": "linkedUsers",+ "column": 1+ }+ ]+ }+ }+ }}}}diff --git a/deployment/map/mapsettings.json b/deployment/map/mapsettings.jsonindex f0a9c1a99..cd2cdc121 100644--- a/deployment/map/mapsettings.json+++ b/deployment/map/mapsettings.json@@ -1,22 +1,31 @@{- "options": {- "default": {- "center": [ 4.485222, 51.911712 ],- "bounds": [ 4.42, 51.88, 4.55, 51.94 ],- "zoom": 14,- "minZoom": 14,- "maxZoom": 19,- "boxZoom": false,- "geocodeUrl": "https://nominatim.openstreetmap.org"+ "options" : {+ "default" : {+ "center" : [ 4.483118, 51.915767 ],+ "bounds" : [ 4.24, 51.89, 4.51, 51.99 ],+ "zoom" : 15,+ "minZoom" : 0,+ "maxZoom" : 19,+ "boxZoom" : false,+ "geocodeUrl" : "https://nominatim.openstreetmap.org"},"smartcity": {- "center": [ 4.485222, 51.911712 ],- "bounds": [ 4.42, 51.88, 4.55, 51.94 ],+ "center": [ 4.483118, 51.915767 ],+ "bounds" : [ 4.24, 51.89, 4.51, 51.99 ],"zoom": 15,- "minZoom": 14,+ "minZoom": 11,"maxZoom": 19,"boxZoom": false,"geocodeUrl": "https://nominatim.openstreetmap.org"+ },+ "manufacturer": {+ "center": [ 4.352753, 51.961949 ],+ "bounds" : [ 4.24, 51.89, 4.51, 51.99 ],+ "zoom": 13,+ "minZoom": 10,+ "maxZoom": 19,+ "boxZoom": true,+ "geocodeUrl": "https://nominatim.openstreetmap.org"}},"version": 8,diff --git a/manager/src/map/mapdata.mbtiles b/manager/src/map/mapdata.mbtilesindex c27e27128..3a111ac4f 100644Binary files a/manager/src/map/mapdata.mbtiles and b/manager/src/map/mapdata.mbtiles differdiff --git a/manager/src/map/mapsettings.json b/manager/src/map/mapsettings.jsonindex 18485b6f9..3bd363208 100644--- a/manager/src/map/mapsettings.json+++ b/manager/src/map/mapsettings.json@@ -1,3994 +1,1919 @@{- "options": {- "default": {- "center": [ 4.485222, 51.911712 ],- "bounds": [ 4.42, 51.88, 4.55, 51.94 ],- "zoom": 14,+ "options" : {+ "default" : {+ "center" : [ 4.483118, 51.915767 ],+ "bounds" : [ 4.24, 51.89, 4.51, 51.99 ],+ "zoom" : 15,+ "minZoom" : 0,+ "maxZoom" : 19,+ "boxZoom" : false,+ "geocodeUrl" : "https://nominatim.openstreetmap.org"+ },+ "smartcity": {+ "center": [ 4.483118, 51.915767 ],+ "bounds" : [ 4.24, 51.89, 4.51, 51.99 ],+ "zoom": 15,+ "minZoom": 11,"maxZoom": 19,"boxZoom": false,"geocodeUrl": "https://nominatim.openstreetmap.org"+ },+ "manufacturer": {+ "center": [ 4.352753, 51.961949 ],+ "bounds" : [ 4.24, 51.89, 4.51, 51.99 ],+ "zoom": 13,+ "minZoom": 10,+ "maxZoom": 19,+ "boxZoom": true,+ "geocodeUrl": "https://nominatim.openstreetmap.org"}},- "version": 8,- "sources": {- "vector_tiles": {- "type": "vector",- "url": "mbtiles://mapdata.mbtiles"+ "version" : 8,+ "sources" : {+ "vector_tiles" : {+ "type" : "vector",+ "url" : "mbtiles://mapdata.mbtiles"}},- "sprite": "map/sprites/bright-v9",- "glyphs": "{fontstack}/{range}.pbf",- "layers": [- {- "id": "background",- "type": "background",- "paint": {- "background-color": "#ecf2ea"- }- },- {- "id": "landcover-glacier",- "type": "fill",- "metadata": {- "mapbox:group": "1444849388993.3071"- },- "source": "vector_tiles",- "source-layer": "landcover",- "filter": [- "==",- "subclass",- "glacier"- ],- "layout": {- "visibility": "visible"- },- "paint": {- "fill-color": "#fff",- "fill-opacity": {- "base": 1,- "stops": [- [ 0, 0.9 ],- [ 10, 0.3 ]- ]- }- }- },- {- "id": "landuse-residential",- "type": "fill",- "metadata": {- "mapbox:group": "1444849388993.3071"- },- "source": "vector_tiles",- "source-layer": "landuse",- "filter": [- "==",- "class",- "residential"- ],- "paint": {- "fill-color": "#e1e6e0"- }- },- {- "id": "landuse-commercial",- "type": "fill",- "metadata": {- "mapbox:group": "1444849388993.3071"- },- "source": "vector_tiles",- "source-layer": "landuse",- "filter": [- "all",- [- "==",- "$type",- "Polygon"- ],- [- "==",- "class",- "commercial"- ]- ],- "paint": {- "fill-color": "#e1e6e0"- }- },- {- "id": "landuse-industrial",- "type": "fill",- "metadata": {- "mapbox:group": "1444849388993.3071"- },- "source": "vector_tiles",- "source-layer": "landuse",- "filter": [- "all",- [- "==",- "$type",- "Polygon"- ],- [- "==",- "class",- "industrial"- ]- ],- "paint": {- "fill-color": "#e1e6e0"- }- },- {- "id": "park",- "type": "fill",- "metadata": {- "mapbox:group": "1444849388993.3071"- },- "source": "vector_tiles",- "source-layer": "park",- "filter": [- "==",- "$type",- "Polygon"- ],- "paint": {- "fill-color": "#d8e8c8",- "fill-opacity": {- "base": 1.8,- "stops": [- [ 9, 0.5 ],- [ 12, 0.2 ]- ]- }- }- },- {- "id": "park-outline",- "type": "line",- "metadata": {- "mapbox:group": "1444849388993.3071"- },- "source": "vector_tiles",- "source-layer": "park",- "filter": [- "==",- "$type",- "Polygon"- ],- "layout": {},- "paint": {- "line-color": {- "base": 1,- "stops": [- [ 6, "hsla(96, 40%, 49%, 0.36)" ],- [ 8, "hsla(96, 40%, 49%, 0.66)" ]- ]- },- "line-dasharray": [- 3,- 3- ]- }- },- {- "id": "landuse-cemetery",- "type": "fill",- "metadata": {- "mapbox:group": "1444849388993.3071"- },- "source": "vector_tiles",- "source-layer": "landuse",- "filter": [- "==",- "class",- "cemetery"- ],- "paint": {- "fill-color": "#e1e6e0"- }- },- {- "id": "landuse-hospital",- "type": "fill",- "metadata": {- "mapbox:group": "1444849388993.3071"- },- "source": "vector_tiles",- "source-layer": "landuse",- "filter": [- "==",- "class",- "hospital"- ],- "paint": {- "fill-color": "#e1e6e0"- }- },- {- "id": "landuse-school",- "type": "fill",- "metadata": {- "mapbox:group": "1444849388993.3071"- },- "source": "vector_tiles",- "source-layer": "landuse",- "filter": [- "==",- "class",- "school"- ],- "paint": {- "fill-color": "#e1e6e0"- }- },- {- "id": "landuse-railway",- "type": "fill",- "metadata": {- "mapbox:group": "1444849388993.3071"- },- "source": "vector_tiles",- "source-layer": "landuse",- "filter": [- "==",- "class",- "railway"- ],- "paint": {- "fill-color": "hsla(30, 19%, 90%, 0.4)"- }- },- {- "id": "landcover-wood",- "type": "fill",- "metadata": {- "mapbox:group": "1444849388993.3071"- },- "source": "vector_tiles",- "source-layer": "landcover",- "filter": [- "==",- "class",- "wood"- ],- "paint": {- "fill-color": "#6a4",- "fill-opacity": 0.1,- "fill-outline-color": "hsla(0, 0%, 0%, 0.03)",- "fill-antialias": {- "base": 1,- "stops": [- [ 0, false ],- [ 9, true ]- ]- }- }- },- {- "id": "landcover-grass",- "type": "fill",- "metadata": {- "mapbox:group": "1444849388993.3071"- },- "source": "vector_tiles",- "source-layer": "landcover",- "filter": [- "==",- "class",- "grass"- ],- "paint": {- "fill-color": "#d8e8c8",- "fill-opacity": 1- }- },- {- "id": "landcover-grass-park",- "type": "fill",- "metadata": {- "mapbox:group": "1444849388993.3071"- },- "source": "vector_tiles",- "source-layer": "park",- "filter": [- "==",- "class",- "public_park"- ],- "paint": {- "fill-color": "#d8e8c8",- "fill-opacity": 0.8- }- },- {- "id": "waterway-other",- "type": "line",- "metadata": {- "mapbox:group": "1444849382550.77"- },- "source": "vector_tiles",- "source-layer": "waterway",- "filter": [- "!in",- "class",- "canal",- "river",- "stream"- ],- "layout": {- "line-cap": "round"- },- "paint": {- "line-color": "#bad4ff",- "line-width": {- "base": 1.3,- "stops": [- [ 13, 0.5 ],- [ 20, 2 ]- ]- }- }- },- {- "id": "waterway-stream-canal",- "type": "line",- "metadata": {- "mapbox:group": "1444849382550.77"- },- "source": "vector_tiles",- "source-layer": "waterway",- "filter": [- "in",- "class",- "canal",- "stream"- ],- "layout": {- "line-cap": "round"- },- "paint": {- "line-color": "#bad4ff",- "line-width": {- "base": 1.3,- "stops": [- [ 13, 0.5 ],- [ 20, 6 ]- ]- }- }- },- {- "id": "waterway-river",- "type": "line",- "metadata": {- "mapbox:group": "1444849382550.77"- },- "source": "vector_tiles",- "source-layer": "waterway",- "filter": [- "==",- "class",- "river"- ],- "layout": {- "line-cap": "round"- },- "paint": {- "line-color": "#bad4ff",- "line-width": {- "base": 1.2,- "stops": [- [ 10, 0.8 ],- [ 20, 6 ]- ]- }- }- },- {- "id": "water-offset",- "type": "fill",- "metadata": {- "mapbox:group": "1444849382550.77"- },- "source": "vector_tiles",- "source-layer": "water",- "maxzoom": 8,- "filter": [- "==",- "$type",- "Polygon"- ],- "layout": {- "visibility": "visible"- },- "paint": {- "fill-opacity": 1,- "fill-color": "#bad4ff",- "fill-translate": {- "base": 1,- "stops": [- [- 6,- [ 2, 0 ]- ],- [- 8,- [ 0, 0 ]- ]- ]- }- }- },- {- "id": "water",- "type": "fill",- "metadata": {- "mapbox:group": "1444849382550.77"- },- "source": "vector_tiles",- "source-layer": "water",- "layout": {- "visibility": "visible"- },- "paint": {- "fill-color": "#bad4ff"- }- },- {- "id": "water-pattern",- "type": "fill",- "metadata": {- "mapbox:group": "1444849382550.77"- },- "source": "vector_tiles",- "source-layer": "water",- "layout": {- "visibility": "visible"- },- "paint": {- "fill-translate": [- 0,- 2.5- ],- "fill-pattern": "wave"- }- },- {- "id": "landcover-ice-shelf",- "type": "fill",- "metadata": {- "mapbox:group": "1444849382550.77"- },- "source": "vector_tiles",- "source-layer": "landcover",- "filter": [- "==",- "subclass",- "ice_shelf"- ],- "layout": {- "visibility": "visible"- },- "paint": {- "fill-color": "#fff",- "fill-opacity": {- "base": 1,- "stops": [- [ 0, 0.9 ],- [ 10, 0.3 ]- ]- }- }- },- {- "id": "building",- "type": "fill",- "metadata": {- "mapbox:group": "1444849364238.8171"- },- "source": "vector_tiles",- "source-layer": "building",- "paint": {- "fill-color": {- "base": 1,- "stops": [- [ 15.5, "#cbd8c5" ],- [ 16, "#cbd8c5" ]- ]- },- "fill-antialias": true- }- },- {- "id": "building-top",- "type": "fill",- "metadata": {- "mapbox:group": "1444849364238.8171"- },- "source": "vector_tiles",- "source-layer": "building",- "layout": {- "visibility": "visible"- },- "paint": {- "fill-translate": {- "base": 1,- "stops": [- [- 14,- [ 0, 0 ]- ],- [- 16,- [ -2, -2 ]- ]- ]- },- "fill-outline-color": "#aaa",- "fill-color": "#cbd8c5",- "fill-opacity": {- "base": 1,- "stops": [- [ 13, 0 ],- [ 16, 1 ]- ]- }- }- },- {- "id": "housenumber",- "type": "symbol",- "source": "vector_tiles",- "source-layer": "housenumber",- "minzoom": 18,- "filter": [- "==",- "$type",- "Point"- ],- "layout": {- "text-field": "{housenumber}",- "text-size": 10,- "text-font": [- "Open Sans Italic"- ]- },- "paint": {- "text-color": "#666"- }- },- {- "id": "tunnel-service-track-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849354174.1904"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "tunnel"- ],- [- "in",- "class",- "service",- "track"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#aaa",- "line-dasharray": [- 0.5,- 0.25- ],- "line-width": {- "base": 1.2,- "stops": [- [ 15, 1 ],- [ 16, 4 ],- [ 20, 11 ]- ]- }- }- },- {- "id": "tunnel-minor-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849354174.1904"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "tunnel"- ],- [- "==",- "class",- "minor"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#aaa",- "line-opacity": {- "stops": [- [- 12,- 0- ],- [- 12.5,- 1- ]- ]- },- "line-width": {- "base": 1.2,- "stops": [- [- 12,- 0.5- ],- [- 13,- 1- ],- [- 14,- 4- ],- [- 20,- 15- ]- ]- }- }- },- {- "id": "tunnel-secondary-tertiary-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849354174.1904"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "tunnel"- ],- [- "in",- "class",- "secondary",- "tertiary"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#aaa",- "line-opacity": 1,- "line-width": {- "base": 1.2,- "stops": [- [- 8,- 1.5- ],- [- 20,- 17- ]- ]- }- }- },- {- "id": "tunnel-trunk-primary-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849354174.1904"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "tunnel"- ],- [- "in",- "class",- "primary",- "trunk"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#aaa",- "line-width": {- "base": 1.2,- "stops": [- [- 5,- 0.4- ],- [- 6,- 0.6- ],- [- 7,- 1.5- ],- [- 20,- 22- ]- ]- }- }- },- {- "id": "tunnel-motorway-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849354174.1904"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "tunnel"- ],- [- "==",- "class",- "motorway"- ]- ],- "layout": {- "line-join": "round",- "visibility": "visible"- },- "paint": {- "line-color": "#aaa",- "line-dasharray": [- 0.5,- 0.25- ],- "line-width": {- "base": 1.2,- "stops": [- [- 5,- 0.4- ],- [- 6,- 0.6- ],- [- 7,- 1.5- ],- [- 20,- 22- ]- ]- }- }- },- {- "id": "tunnel-path",- "type": "line",- "metadata": {- "mapbox:group": "1444849354174.1904"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "$type",- "LineString"- ],- [- "all",- [- "==",- "brunnel",- "tunnel"- ],- [- "==",- "class",- "path"- ]- ]- ],- "paint": {- "line-color": "#555",- "line-dasharray": [- 1.5,- 0.75- ],- "line-width": {- "base": 1.2,- "stops": [- [- 15,- 1.2- ],- [- 20,- 4- ]- ]- }- }- },- {- "id": "tunnel-service-track",- "type": "line",- "metadata": {- "mapbox:group": "1444849354174.1904"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "tunnel"- ],- [- "in",- "class",- "service",- "track"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#fff",- "line-width": {- "base": 1.2,- "stops": [- [- 15.5,- 0- ],- [- 16,- 2- ],- [- 20,- 7.5- ]- ]- }- }- },- {- "id": "tunnel-minor",- "type": "line",- "metadata": {- "mapbox:group": "1444849354174.1904"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "tunnel"- ],- [- "==",- "class",- "minor_road"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#fff",- "line-opacity": 1,- "line-width": {- "base": 1.2,- "stops": [- [- 13.5,- 0- ],- [- 14,- 2.5- ],- [- 20,- 11.5- ]- ]- }- }- },- {- "id": "tunnel-secondary-tertiary",- "type": "line",- "metadata": {- "mapbox:group": "1444849354174.1904"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "tunnel"- ],- [- "in",- "class",- "secondary",- "tertiary"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#444",- "line-width": {- "base": 1.2,- "stops": [- [- 6.5,- 0- ],- [- 7,- 0.5- ],- [- 20,- 10- ]- ]- }- }- },- {- "id": "tunnel-trunk-primary",- "type": "line",- "metadata": {- "mapbox:group": "1444849354174.1904"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "tunnel"- ],- [- "in",- "class",- "primary",- "trunk"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#fff4c6",- "line-width": {- "base": 1.2,- "stops": [- [- 6.5,- 0- ],- [- 7,- 0.5- ],- [- 20,- 18- ]- ]- }- }- },- {- "id": "tunnel-motorway",- "type": "line",- "metadata": {- "mapbox:group": "1444849354174.1904"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "tunnel"- ],- [- "==",- "class",- "motorway"- ]- ],- "layout": {- "line-join": "round",- "visibility": "visible"- },- "paint": {- "line-color": "#aaa",- "line-width": {- "base": 1.2,- "stops": [- [- 6.5,- 0- ],- [- 7,- 0.5- ],- [- 20,- 18- ]- ]- }- }- },- {- "id": "tunnel-railway",- "type": "line",- "metadata": {- "mapbox:group": "1444849354174.1904"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "tunnel"- ],- [- "==",- "class",- "rail"- ]- ],- "paint": {- "line-color": "#bbb",- "line-width": {- "base": 1.4,- "stops": [- [ 14, 0.4 ],- [ 15, 0.75 ],- [ 20, 2 ]- ]- },- "line-dasharray": [- 2,- 2- ]- }- },- {- "id": "aeroway-taxiway-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "aeroway",- "minzoom": 12,- "filter": [- "all",- [- "in",- "class",- "taxiway"- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round",- "visibility": "visible"- },- "paint": {- "line-color": "rgba(153, 153, 153, 1)",- "line-width": {- "base": 1.5,- "stops": [- [- 11,- 2- ],- [- 17,- 12- ]- ]- },- "line-opacity": 1- }- },- {- "id": "aeroway-runway-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "aeroway",- "minzoom": 12,- "filter": [- "all",- [- "in",- "class",- "runway"- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round",- "visibility": "visible"- },- "paint": {- "line-color": "#aaa",- "line-width": {- "base": 1.5,- "stops": [- [- 11,- 5- ],- [- 17,- 55- ]- ]- },- "line-opacity": 1- }- },- {- "id": "aeroway-area",- "type": "fill",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "aeroway",- "minzoom": 4,- "filter": [- "all",- [- "==",- "$type",- "Polygon"- ],- [- "in",- "class",- "runway",- "taxiway"- ]- ],- "layout": {- "visibility": "visible"- },- "paint": {- "fill-opacity": {- "base": 1,- "stops": [- [ 13, 0 ],- [ 14, 1 ]- ]- },- "fill-color": "#f0f0f0"- }- },- {- "id": "aeroway-taxiway",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "aeroway",- "minzoom": 4,- "filter": [- "all",- [- "in",- "class",- "taxiway"- ],- [- "==",- "$type",- "LineString"- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round",- "visibility": "visible"- },- "paint": {- "line-color": "#e9e9e9",- "line-width": {- "base": 1.5,- "stops": [- [ 11, 1 ],- [ 17, 10 ]- ]- },- "line-opacity": {- "base": 1,- "stops": [- [ 11, 0 ],- [ 12, 1 ]- ]- }- }- },- {- "id": "aeroway-runway",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "aeroway",- "minzoom": 4,- "filter": [- "all",- [- "in",- "class",- "runway"- ],- [- "==",- "$type",- "LineString"- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round",- "visibility": "visible"- },- "paint": {- "line-color": "#f0f0f0",- "line-width": {- "base": 1.5,- "stops": [- [ 11, 4 ],- [ 17, 50 ]- ]- },- "line-opacity": {- "base": 1,- "stops": [- [ 11, 0 ],- [ 12, 1 ]- ]- }- }- },- {- "id": "highway-area",- "type": "fill",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "==",- "$type",- "Polygon"- ],- "layout": {- "visibility": "visible"- },- "paint": {- "fill-color": "hsla(0, 0%, 89%, 0.56)",- "fill-outline-color": "#cfcdca",- "fill-opacity": 0.9,- "fill-antialias": false- }- },- {- "id": "highway-motorway-link-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "minzoom": 12,- "filter": [- "all",- [- "!in",- "brunnel",- "bridge",- "tunnel"- ],- [- "==",- "class",- "motorway_link"- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round"- },- "paint": {- "line-color": "#e9ac77",- "line-opacity": 1,- "line-width": {- "base": 1.2,- "stops": [- [- 12,- 1- ],- [- 13,- 3- ],- [- 14,- 4- ],- [- 20,- 15- ]- ]- }- }- },- {- "id": "highway-link-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "minzoom": 13,- "filter": [- "all",- [- "!in",- "brunnel",- "bridge",- "tunnel"- ],- [- "in",- "class",- "primary_link",- "secondary_link",- "tertiary_link",- "trunk_link"- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round",- "visibility": "visible"- },- "paint": {- "line-color": "#e9ac77",- "line-opacity": 1,- "line-width": {- "base": 1.2,- "stops": [- [- 12,- 1- ],- [- 13,- 3- ],- [- 14,- 4- ],- [- 20,- 15- ]- ]- }+ "sprite" : "map/sprites/bright-v9",+ "glyphs" : "{fontstack}/{range}.pbf",+ "layers" : [ {+ "id" : "background",+ "type" : "background",+ "paint" : {+ "background-color" : "#ecf2ea"+ }+ }, {+ "id" : "landcover-glacier",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849388993.3071"+ },+ "source" : "vector_tiles",+ "source-layer" : "landcover",+ "filter" : [ "==", "subclass", "glacier" ],+ "layout" : {+ "visibility" : "visible"+ },+ "paint" : {+ "fill-color" : "#fff",+ "fill-opacity" : {+ "base" : 1,+ "stops" : [ [ 0, 0.9 ], [ 10, 0.3 ] ]}- },- {- "id": "highway-minor-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "$type",- "LineString"- ],- [- "all",- [- "!=",- "brunnel",- "tunnel"- ],- [- "in",- "class",- "minor",- "service",- "track"- ]- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round"- },- "paint": {- "line-color": "#cfcdca",- "line-opacity": {- "stops": [- [- 12,- 0- ],- [- 12.5,- 1- ]- ]- },- "line-width": {- "base": 1.2,- "stops": [- [- 12,- 0.5- ],- [- 13,- 1- ],- [- 14,- 4- ],- [- 20,- 15- ]- ]- }+ }+ }, {+ "id" : "landuse-residential",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849388993.3071"+ },+ "source" : "vector_tiles",+ "source-layer" : "landuse",+ "filter" : [ "==", "class", "residential" ],+ "paint" : {+ "fill-color" : "#e1e6e0"+ }+ }, {+ "id" : "landuse-commercial",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849388993.3071"+ },+ "source" : "vector_tiles",+ "source-layer" : "landuse",+ "filter" : [ "all", [ "==", "$type", "Polygon" ], [ "==", "class", "commercial" ] ],+ "paint" : {+ "fill-color" : "#e1e6e0"+ }+ }, {+ "id" : "landuse-industrial",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849388993.3071"+ },+ "source" : "vector_tiles",+ "source-layer" : "landuse",+ "filter" : [ "all", [ "==", "$type", "Polygon" ], [ "==", "class", "industrial" ] ],+ "paint" : {+ "fill-color" : "#e1e6e0"+ }+ }, {+ "id" : "park",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849388993.3071"+ },+ "source" : "vector_tiles",+ "source-layer" : "park",+ "filter" : [ "==", "$type", "Polygon" ],+ "paint" : {+ "fill-color" : "#d8e8c8",+ "fill-opacity" : {+ "base" : 1.8,+ "stops" : [ [ 9, 0.5 ], [ 12, 0.2 ] ]}- },- {- "id": "highway-secondary-tertiary-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "!in",- "brunnel",- "bridge",- "tunnel"- ],- [- "in",- "class",- "secondary",- "tertiary"- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round",- "visibility": "visible"- },- "paint": {- "line-color": "#999999",- "line-opacity": 1,- "line-width": {- "base": 1.2,- "stops": [- [- 8,- 1.5- ],- [- 20,- 17- ]- ]- }+ }+ }, {+ "id" : "park-outline",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849388993.3071"+ },+ "source" : "vector_tiles",+ "source-layer" : "park",+ "filter" : [ "==", "$type", "Polygon" ],+ "layout" : { },+ "paint" : {+ "line-color" : {+ "base" : 1,+ "stops" : [ [ 6, "hsla(96, 40%, 49%, 0.36)" ], [ 8, "hsla(96, 40%, 49%, 0.66)" ] ]+ },+ "line-dasharray" : [ 3, 3 ]+ }+ }, {+ "id" : "landuse-cemetery",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849388993.3071"+ },+ "source" : "vector_tiles",+ "source-layer" : "landuse",+ "filter" : [ "==", "class", "cemetery" ],+ "paint" : {+ "fill-color" : "#e1e6e0"+ }+ }, {+ "id" : "landuse-hospital",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849388993.3071"+ },+ "source" : "vector_tiles",+ "source-layer" : "landuse",+ "filter" : [ "==", "class", "hospital" ],+ "paint" : {+ "fill-color" : "#e1e6e0"+ }+ }, {+ "id" : "landuse-school",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849388993.3071"+ },+ "source" : "vector_tiles",+ "source-layer" : "landuse",+ "filter" : [ "==", "class", "school" ],+ "paint" : {+ "fill-color" : "#e1e6e0"+ }+ }, {+ "id" : "landuse-railway",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849388993.3071"+ },+ "source" : "vector_tiles",+ "source-layer" : "landuse",+ "filter" : [ "==", "class", "railway" ],+ "paint" : {+ "fill-color" : "hsla(30, 19%, 90%, 0.4)"+ }+ }, {+ "id" : "landcover-wood",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849388993.3071"+ },+ "source" : "vector_tiles",+ "source-layer" : "landcover",+ "filter" : [ "==", "class", "wood" ],+ "paint" : {+ "fill-color" : "#6a4",+ "fill-opacity" : 0.1,+ "fill-outline-color" : "hsla(0, 0%, 0%, 0.03)",+ "fill-antialias" : {+ "base" : 1,+ "stops" : [ [ 0, false ], [ 9, true ] ]}- },- {- "id": "highway-trunk-primary-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "minzoom": 5,- "filter": [- "all",- [- "!in",- "brunnel",- "bridge",- "tunnel"- ],- [- "in",- "class",- "primary",- "trunk"- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round",- "visibility": "visible"- },- "paint": {- "line-color": "#a0a0a0",- "line-opacity": {- "stops": [- [- 5,- 0- ],- [- 6,- 1- ]- ]- },- "line-width": {- "base": 1.2,- "stops": [- [- 5,- 0- ],- [- 6,- 0.6- ],- [- 7,- 1.5- ],- [- 20,- 22- ]- ]- }+ }+ }, {+ "id" : "landcover-grass",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849388993.3071"+ },+ "source" : "vector_tiles",+ "source-layer" : "landcover",+ "filter" : [ "==", "class", "grass" ],+ "paint" : {+ "fill-color" : "#d8e8c8",+ "fill-opacity" : 1+ }+ }, {+ "id" : "landcover-grass-park",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849388993.3071"+ },+ "source" : "vector_tiles",+ "source-layer" : "park",+ "filter" : [ "==", "class", "public_park" ],+ "paint" : {+ "fill-color" : "#d8e8c8",+ "fill-opacity" : 0.8+ }+ }, {+ "id" : "waterway-other",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849382550.77"+ },+ "source" : "vector_tiles",+ "source-layer" : "waterway",+ "filter" : [ "!in", "class", "canal", "river", "stream" ],+ "layout" : {+ "line-cap" : "round"+ },+ "paint" : {+ "line-color" : "#bad4ff",+ "line-width" : {+ "base" : 1.3,+ "stops" : [ [ 13, 0.5 ], [ 20, 2 ] ]}- },- {- "id": "highway-motorway-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "minzoom": 4,- "filter": [- "all",- [- "!in",- "brunnel",- "bridge",- "tunnel"- ],- [- "==",- "class",- "motorway"- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round",- "visibility": "visible"- },- "paint": {- "line-color": "#a0a0a0",- "line-width": {- "base": 1.2,- "stops": [- [- 4,- 0- ],- [- 5,- 0.4- ],- [- 6,- 0.6- ],- [- 7,- 1.5- ],- [- 20,- 22- ]- ]- },- "line-opacity": {- "stops": [- [- 4,- 0- ],- [- 5,- 1- ]- ]- }+ }+ }, {+ "id" : "waterway-stream-canal",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849382550.77"+ },+ "source" : "vector_tiles",+ "source-layer" : "waterway",+ "filter" : [ "in", "class", "canal", "stream" ],+ "layout" : {+ "line-cap" : "round"+ },+ "paint" : {+ "line-color" : "#bad4ff",+ "line-width" : {+ "base" : 1.3,+ "stops" : [ [ 13, 0.5 ], [ 20, 6 ] ]}- },- {- "id": "highway-path",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "$type",- "LineString"- ],- [- "all",- [- "!in",- "brunnel",- "bridge",- "tunnel"- ],- [- "==",- "class",- "path"- ]- ]- ],- "paint": {- "line-color": "#d0d0d0",- "line-dasharray": [- 1.5,- 0.75- ],- "line-width": {- "base": 1.2,- "stops": [- [- 15,- 1.2- ],- [- 20,- 4- ]- ]- }+ }+ }, {+ "id" : "waterway-river",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849382550.77"+ },+ "source" : "vector_tiles",+ "source-layer" : "waterway",+ "filter" : [ "==", "class", "river" ],+ "layout" : {+ "line-cap" : "round"+ },+ "paint" : {+ "line-color" : "#bad4ff",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 10, 0.8 ], [ 20, 6 ] ]}- },- {- "id": "highway-motorway-link",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "minzoom": 12,- "filter": [- "all",- [- "!in",- "brunnel",- "bridge",- "tunnel"- ],- [- "==",- "class",- "motorway_link"- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round"- },- "paint": {- "line-color": "#ffffff",- "line-width": {- "base": 1.2,- "stops": [- [- 12.5,- 0- ],- [- 13,- 1.5- ],- [- 14,- 2.5- ],- [- 20,- 11.5- ]- ]- }+ }+ }, {+ "id" : "water-offset",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849382550.77"+ },+ "source" : "vector_tiles",+ "source-layer" : "water",+ "maxzoom" : 8,+ "filter" : [ "==", "$type", "Polygon" ],+ "layout" : {+ "visibility" : "visible"+ },+ "paint" : {+ "fill-opacity" : 1,+ "fill-color" : "#bad4ff",+ "fill-translate" : {+ "base" : 1,+ "stops" : [ [ 6, [ 2, 0 ] ], [ 8, [ 0, 0 ] ] ]}- },- {- "id": "highway-link",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "minzoom": 13,- "filter": [- "all",- [- "!in",- "brunnel",- "bridge",- "tunnel"- ],- [- "in",- "class",- "primary_link",- "secondary_link",- "tertiary_link",- "trunk_link"- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round",- "visibility": "visible"- },- "paint": {- "line-color": "#ffffff",- "line-width": {- "base": 1.2,- "stops": [- [- 12.5,- 0- ],- [- 13,- 1.5- ],- [- 14,- 2.5- ],- [- 20,- 11.5- ]- ]- }+ }+ }, {+ "id" : "water",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849382550.77"+ },+ "source" : "vector_tiles",+ "source-layer" : "water",+ "layout" : {+ "visibility" : "visible"+ },+ "paint" : {+ "fill-color" : "#bad4ff"+ }+ }, {+ "id" : "water-pattern",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849382550.77"+ },+ "source" : "vector_tiles",+ "source-layer" : "water",+ "layout" : {+ "visibility" : "visible"+ },+ "paint" : {+ "fill-translate" : [ 0, 2.5 ],+ "fill-pattern" : "wave"+ }+ }, {+ "id" : "landcover-ice-shelf",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849382550.77"+ },+ "source" : "vector_tiles",+ "source-layer" : "landcover",+ "filter" : [ "==", "subclass", "ice_shelf" ],+ "layout" : {+ "visibility" : "visible"+ },+ "paint" : {+ "fill-color" : "#fff",+ "fill-opacity" : {+ "base" : 1,+ "stops" : [ [ 0, 0.9 ], [ 10, 0.3 ] ]}- },- {- "id": "highway-minor",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "$type",- "LineString"- ],- [- "all",- [- "!=",- "brunnel",- "tunnel"- ],- [- "in",- "class",- "minor",- "service",- "track"- ]- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round"- },- "paint": {- "line-color": "#ffffff",- "line-opacity": 1,- "line-width": {- "base": 1.2,- "stops": [- [- 13.5,- 0- ],- [- 14,- 2.5- ],- [- 20,- 11.5- ]- ]- }+ }+ }, {+ "id" : "building",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849364238.8171"+ },+ "source" : "vector_tiles",+ "source-layer" : "building",+ "paint" : {+ "fill-color" : {+ "base" : 1,+ "stops" : [ [ 15.5, "#cbd8c5" ], [ 16, "#cbd8c5" ] ]+ },+ "fill-antialias" : true+ }+ }, {+ "id" : "building-top",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849364238.8171"+ },+ "source" : "vector_tiles",+ "source-layer" : "building",+ "layout" : {+ "visibility" : "visible"+ },+ "paint" : {+ "fill-translate" : {+ "base" : 1,+ "stops" : [ [ 14, [ 0, 0 ] ], [ 16, [ -2, -2 ] ] ]+ },+ "fill-outline-color" : "#aaa",+ "fill-color" : "#cbd8c5",+ "fill-opacity" : {+ "base" : 1,+ "stops" : [ [ 13, 0 ], [ 16, 1 ] ]}- },- {- "id": "highway-secondary-tertiary",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "!in",- "brunnel",- "bridge",- "tunnel"- ],- [- "in",- "class",- "secondary",- "tertiary"- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round",- "visibility": "visible"- },- "paint": {- "line-color": "#ffffff",- "line-width": {- "base": 1.2,- "stops": [- [- 6.5,- 0- ],- [- 8,- 0.5- ],- [- 20,- 13- ]- ]- }+ }+ }, {+ "id" : "housenumber",+ "type" : "symbol",+ "source" : "vector_tiles",+ "source-layer" : "housenumber",+ "minzoom" : 18,+ "filter" : [ "==", "$type", "Point" ],+ "layout" : {+ "text-field" : "{housenumber}",+ "text-size" : 10,+ "text-font" : [ "Open Sans Italic" ]+ },+ "paint" : {+ "text-color" : "#666"+ }+ }, {+ "id" : "tunnel-service-track-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849354174.1904"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "tunnel" ], [ "in", "class", "service", "track" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#aaa",+ "line-dasharray" : [ 0.5, 0.25 ],+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 15, 1 ], [ 16, 4 ], [ 20, 11 ] ]}- },- {- "id": "highway-trunk-primary",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "$type",- "LineString"- ],- [- "all",- [- "!in",- "brunnel",- "bridge",- "tunnel"- ],- [- "in",- "class",- "primary",- "trunk"- ]- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round",- "visibility": "visible"- },- "paint": {- "line-color": "#ffffff",- "line-width": {- "base": 1.2,- "stops": [- [- 6.5,- 0- ],- [- 7,- 0.5- ],- [- 20,- 18- ]- ]- }+ }+ }, {+ "id" : "tunnel-minor-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849354174.1904"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "tunnel" ], [ "==", "class", "minor" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#aaa",+ "line-opacity" : {+ "stops" : [ [ 12, 0 ], [ 12.5, 1 ] ]+ },+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 12, 0.5 ], [ 13, 1 ], [ 14, 4 ], [ 20, 15 ] ]}- },- {- "id": "highway-motorway",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "minzoom": 5,- "filter": [- "all",- [- "==",- "$type",- "LineString"- ],- [- "all",- [- "!in",- "brunnel",- "bridge",- "tunnel"- ],- [- "==",- "class",- "motorway"- ]- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round",- "visibility": "visible"- },- "paint": {- "line-color": "#ffffff",- "line-width": {- "base": 1.2,- "stops": [- [- 6.5,- 0- ],- [- 7,- 0.5- ],- [- 20,- 18- ]- ]- }+ }+ }, {+ "id" : "tunnel-secondary-tertiary-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849354174.1904"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "tunnel" ], [ "in", "class", "secondary", "tertiary" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#aaa",+ "line-opacity" : 1,+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 8, 1.5 ], [ 20, 17 ] ]}- },- {- "id": "railway-service",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "$type",- "LineString"- ],- [- "all",- [- "==",- "class",- "rail"- ],- [- "has",- "service"- ]- ]- ],- "paint": {- "line-color": "hsla(0, 0%, 73%, 0.77)",- "line-width": {- "base": 1.4,- "stops": [- [- 14,- 0.4- ],- [- 20,- 1- ]- ]- }+ }+ }, {+ "id" : "tunnel-trunk-primary-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849354174.1904"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "tunnel" ], [ "in", "class", "primary", "trunk" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#aaa",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 5, 0.4 ], [ 6, 0.6 ], [ 7, 1.5 ], [ 20, 22 ] ]}- },- {- "id": "railway-service-hatching",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "$type",- "LineString"- ],- [- "all",- [- "==",- "class",- "rail"- ],- [- "has",- "service"- ]- ]- ],- "layout": {- "visibility": "visible"- },- "paint": {- "line-color": "hsla(0, 0%, 73%, 0.68)",- "line-dasharray": [- 0.2,- 8- ],- "line-width": {- "base": 1.4,- "stops": [- [- 14.5,- 0- ],- [- 15,- 2- ],- [- 20,- 6- ]- ]- }+ }+ }, {+ "id" : "tunnel-motorway-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849354174.1904"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "tunnel" ], [ "==", "class", "motorway" ] ],+ "layout" : {+ "line-join" : "round",+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "#aaa",+ "line-dasharray" : [ 0.5, 0.25 ],+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 5, 0.4 ], [ 6, 0.6 ], [ 7, 1.5 ], [ 20, 22 ] ]}- },- {- "id": "railway",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "$type",- "LineString"- ],- [- "all",- [- "!has",- "service"- ],- [- "!in",- "brunnel",- "bridge",- "tunnel"- ],- [- "==",- "class",- "rail"- ]- ]- ],- "paint": {- "line-color": "#bbb",- "line-width": {- "base": 1.4,- "stops": [- [- 14,- 0.4- ],- [- 15,- 0.75- ],- [- 20,- 2- ]- ]- }+ }+ }, {+ "id" : "tunnel-path",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849354174.1904"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "$type", "LineString" ], [ "all", [ "==", "brunnel", "tunnel" ], [ "==", "class", "path" ] ] ],+ "paint" : {+ "line-color" : "#555",+ "line-dasharray" : [ 1.5, 0.75 ],+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 15, 1.2 ], [ 20, 4 ] ]}- },- {- "id": "railway-hatching",- "type": "line",- "metadata": {- "mapbox:group": "1444849345966.4436"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "$type",- "LineString"- ],- [- "all",- [- "!has",- "service"- ],- [- "!in",- "brunnel",- "bridge",- "tunnel"- ],- [- "==",- "class",- "rail"- ]- ]- ],- "paint": {- "line-color": "#bbb",- "line-dasharray": [- 0.2,- 8- ],- "line-width": {- "base": 1.4,- "stops": [- [- 14.5,- 0- ],- [- 15,- 3- ],- [- 20,- 8- ]- ]- }+ }+ }, {+ "id" : "tunnel-service-track",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849354174.1904"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "tunnel" ], [ "in", "class", "service", "track" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#fff",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 15.5, 0 ], [ 16, 2 ], [ 20, 7.5 ] ]}- },- {- "id": "bridge-motorway-link-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849334699.1902"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "bridge"- ],- [- "==",- "class",- "motorway_link"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#777",- "line-opacity": 1,- "line-width": {- "base": 1.2,- "stops": [- [- 12,- 1- ],- [- 13,- 3- ],- [- 14,- 4- ],- [- 20,- 15- ]- ]- }+ }+ }, {+ "id" : "tunnel-minor",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849354174.1904"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "tunnel" ], [ "==", "class", "minor_road" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#fff",+ "line-opacity" : 1,+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 13.5, 0 ], [ 14, 2.5 ], [ 20, 11.5 ] ]}- },- {- "id": "bridge-link-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849334699.1902"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "bridge"- ],- [- "in",- "class",- "primary_link",- "secondary_link",- "tertiary_link",- "trunk_link"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#666",- "line-opacity": 1,- "line-width": {- "base": 1.2,- "stops": [- [- 12,- 1- ],- [- 13,- 3- ],- [- 14,- 4- ],- [- 20,- 15- ]- ]- }+ }+ }, {+ "id" : "tunnel-secondary-tertiary",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849354174.1904"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "tunnel" ], [ "in", "class", "secondary", "tertiary" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#444",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 6.5, 0 ], [ 7, 0.5 ], [ 20, 10 ] ]}- },- {- "id": "bridge-secondary-tertiary-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849334699.1902"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "bridge"- ],- [- "in",- "class",- "secondary",- "tertiary"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#777",- "line-opacity": 1,- "line-width": {- "base": 1.2,- "stops": [- [- 8,- 1.5- ],- [- 20,- 28- ]- ]- }+ }+ }, {+ "id" : "tunnel-trunk-primary",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849354174.1904"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "tunnel" ], [ "in", "class", "primary", "trunk" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#fff4c6",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 6.5, 0 ], [ 7, 0.5 ], [ 20, 18 ] ]}- },- {- "id": "bridge-trunk-primary-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849334699.1902"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "bridge"- ],- [- "in",- "class",- "primary",- "trunk"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#777",- "line-width": {- "base": 1.2,- "stops": [- [- 5,- 0.4- ],- [- 6,- 0.6- ],- [- 7,- 1.5- ],- [- 20,- 26- ]- ]- }+ }+ }, {+ "id" : "tunnel-motorway",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849354174.1904"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "tunnel" ], [ "==", "class", "motorway" ] ],+ "layout" : {+ "line-join" : "round",+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "#aaa",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 6.5, 0 ], [ 7, 0.5 ], [ 20, 18 ] ]}- },- {- "id": "bridge-motorway-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849334699.1902"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "bridge"- ],- [- "==",- "class",- "motorway"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#777",- "line-width": {- "base": 1.2,- "stops": [- [- 5,- 0.4- ],- [- 6,- 0.6- ],- [- 7,- 1.5- ],- [- 20,- 22- ]- ]- }+ }+ }, {+ "id" : "tunnel-railway",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849354174.1904"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "tunnel" ], [ "==", "class", "rail" ] ],+ "paint" : {+ "line-color" : "#bbb",+ "line-width" : {+ "base" : 1.4,+ "stops" : [ [ 14, 0.4 ], [ 15, 0.75 ], [ 20, 2 ] ]+ },+ "line-dasharray" : [ 2, 2 ]+ }+ }, {+ "id" : "aeroway-taxiway-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "aeroway",+ "minzoom" : 12,+ "filter" : [ "all", [ "in", "class", "taxiway" ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round",+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "rgba(153, 153, 153, 1)",+ "line-width" : {+ "base" : 1.5,+ "stops" : [ [ 11, 2 ], [ 17, 12 ] ]+ },+ "line-opacity" : 1+ }+ }, {+ "id" : "aeroway-runway-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "aeroway",+ "minzoom" : 12,+ "filter" : [ "all", [ "in", "class", "runway" ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round",+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "#aaa",+ "line-width" : {+ "base" : 1.5,+ "stops" : [ [ 11, 5 ], [ 17, 55 ] ]+ },+ "line-opacity" : 1+ }+ }, {+ "id" : "aeroway-area",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "aeroway",+ "minzoom" : 4,+ "filter" : [ "all", [ "==", "$type", "Polygon" ], [ "in", "class", "runway", "taxiway" ] ],+ "layout" : {+ "visibility" : "visible"+ },+ "paint" : {+ "fill-opacity" : {+ "base" : 1,+ "stops" : [ [ 13, 0 ], [ 14, 1 ] ]+ },+ "fill-color" : "#f0f0f0"+ }+ }, {+ "id" : "aeroway-taxiway",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "aeroway",+ "minzoom" : 4,+ "filter" : [ "all", [ "in", "class", "taxiway" ], [ "==", "$type", "LineString" ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round",+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "#e9e9e9",+ "line-width" : {+ "base" : 1.5,+ "stops" : [ [ 11, 1 ], [ 17, 10 ] ]+ },+ "line-opacity" : {+ "base" : 1,+ "stops" : [ [ 11, 0 ], [ 12, 1 ] ]}- },- {- "id": "bridge-path-casing",- "type": "line",- "metadata": {- "mapbox:group": "1444849334699.1902"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "$type",- "LineString"- ],- [- "all",- [- "==",- "brunnel",- "bridge"- ],- [- "==",- "class",- "path"- ]- ]- ],- "paint": {- "line-color": "#777",- "line-width": {- "base": 1.2,- "stops": [- [- 15,- 1.2- ],- [- 20,- 18- ]- ]- }+ }+ }, {+ "id" : "aeroway-runway",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "aeroway",+ "minzoom" : 4,+ "filter" : [ "all", [ "in", "class", "runway" ], [ "==", "$type", "LineString" ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round",+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "#f0f0f0",+ "line-width" : {+ "base" : 1.5,+ "stops" : [ [ 11, 4 ], [ 17, 50 ] ]+ },+ "line-opacity" : {+ "base" : 1,+ "stops" : [ [ 11, 0 ], [ 12, 1 ] ]}- },- {- "id": "bridge-path",- "type": "line",- "metadata": {- "mapbox:group": "1444849334699.1902"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "$type",- "LineString"- ],- [- "all",- [- "==",- "brunnel",- "bridge"- ],- [- "==",- "class",- "path"- ]- ]- ],- "paint": {- "line-color": "#ddd",- "line-width": {- "base": 1.2,- "stops": [- [- 15,- 1.2- ],- [- 20,- 4- ]- ]- },- "line-dasharray": [- 1.5,- 0.75- ]+ }+ }, {+ "id" : "highway-area",+ "type" : "fill",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "==", "$type", "Polygon" ],+ "layout" : {+ "visibility" : "visible"+ },+ "paint" : {+ "fill-color" : "hsla(0, 0%, 89%, 0.56)",+ "fill-outline-color" : "#cfcdca",+ "fill-opacity" : 0.9,+ "fill-antialias" : false+ }+ }, {+ "id" : "highway-motorway-link-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "minzoom" : 12,+ "filter" : [ "all", [ "!in", "brunnel", "bridge", "tunnel" ], [ "==", "class", "motorway_link" ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#e9ac77",+ "line-opacity" : 1,+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 12, 1 ], [ 13, 3 ], [ 14, 4 ], [ 20, 15 ] ]}- },- {- "id": "bridge-motorway-link",- "type": "line",- "metadata": {- "mapbox:group": "1444849334699.1902"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "bridge"- ],- [- "==",- "class",- "motorway_link"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#ffffff",- "line-width": {- "base": 1.2,- "stops": [- [- 12.5,- 0- ],- [- 13,- 1.5- ],- [- 14,- 2.5- ],- [- 20,- 11.5- ]- ]- }+ }+ }, {+ "id" : "highway-link-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "minzoom" : 13,+ "filter" : [ "all", [ "!in", "brunnel", "bridge", "tunnel" ], [ "in", "class", "primary_link", "secondary_link", "tertiary_link", "trunk_link" ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round",+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "#e9ac77",+ "line-opacity" : 1,+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 12, 1 ], [ 13, 3 ], [ 14, 4 ], [ 20, 15 ] ]}- },- {- "id": "bridge-link",- "type": "line",- "metadata": {- "mapbox:group": "1444849334699.1902"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "bridge"- ],- [- "in",- "class",- "primary_link",- "secondary_link",- "tertiary_link",- "trunk_link"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#ffffff",- "line-width": {- "base": 1.2,- "stops": [- [- 12.5,- 0- ],- [- 13,- 1.5- ],- [- 14,- 2.5- ],- [- 20,- 11.5- ]- ]- }+ }+ }, {+ "id" : "highway-minor-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "$type", "LineString" ], [ "all", [ "!=", "brunnel", "tunnel" ], [ "in", "class", "minor", "service", "track" ] ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#cfcdca",+ "line-opacity" : {+ "stops" : [ [ 12, 0 ], [ 12.5, 1 ] ]+ },+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 12, 0.5 ], [ 13, 1 ], [ 14, 4 ], [ 20, 15 ] ]}- },- {- "id": "bridge-secondary-tertiary",- "type": "line",- "metadata": {- "mapbox:group": "1444849334699.1902"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "bridge"- ],- [- "in",- "class",- "secondary",- "tertiary"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#f5f5f5",- "line-width": {- "base": 1.2,- "stops": [- [- 6.5,- 0- ],- [- 7,- 0.5- ],- [- 20,- 20- ]- ]- }+ }+ }, {+ "id" : "highway-secondary-tertiary-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "!in", "brunnel", "bridge", "tunnel" ], [ "in", "class", "secondary", "tertiary" ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round",+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "#999999",+ "line-opacity" : 1,+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 8, 1.5 ], [ 20, 17 ] ]}- },- {- "id": "bridge-trunk-primary",- "type": "line",- "metadata": {- "mapbox:group": "1444849334699.1902"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "bridge"- ],- [- "in",- "class",- "primary",- "trunk"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#f0f0f0",- "line-width": {- "base": 1.2,- "stops": [- [- 6.5,- 0- ],- [- 7,- 0.5- ],- [- 20,- 18- ]- ]- }+ }+ }, {+ "id" : "highway-trunk-primary-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "minzoom" : 5,+ "filter" : [ "all", [ "!in", "brunnel", "bridge", "tunnel" ], [ "in", "class", "primary", "trunk" ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round",+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "#a0a0a0",+ "line-opacity" : {+ "stops" : [ [ 5, 0 ], [ 6, 1 ] ]+ },+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 5, 0 ], [ 6, 0.6 ], [ 7, 1.5 ], [ 20, 22 ] ]}- },- {- "id": "bridge-motorway",- "type": "line",- "metadata": {- "mapbox:group": "1444849334699.1902"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "bridge"- ],- [- "==",- "class",- "motorway"- ]- ],- "layout": {- "line-join": "round"- },- "paint": {- "line-color": "#f0f0f0",- "line-width": {- "base": 1.2,- "stops": [- [- 6.5,- 0- ],- [- 7,- 0.5- ],- [- 20,- 18- ]- ]- }+ }+ }, {+ "id" : "highway-motorway-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "minzoom" : 4,+ "filter" : [ "all", [ "!in", "brunnel", "bridge", "tunnel" ], [ "==", "class", "motorway" ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round",+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "#a0a0a0",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 4, 0 ], [ 5, 0.4 ], [ 6, 0.6 ], [ 7, 1.5 ], [ 20, 22 ] ]+ },+ "line-opacity" : {+ "stops" : [ [ 4, 0 ], [ 5, 1 ] ]}- },- {- "id": "bridge-railway",- "type": "line",- "metadata": {- "mapbox:group": "1444849334699.1902"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "bridge"- ],- [- "==",- "class",- "rail"- ]- ],- "paint": {- "line-color": "#f0f0f0",- "line-width": {- "base": 1.4,- "stops": [- [- 14,- 0.4- ],- [- 15,- 0.75- ],- [- 20,- 2- ]- ]- }+ }+ }, {+ "id" : "highway-path",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "$type", "LineString" ], [ "all", [ "!in", "brunnel", "bridge", "tunnel" ], [ "==", "class", "path" ] ] ],+ "paint" : {+ "line-color" : "#d0d0d0",+ "line-dasharray" : [ 1.5, 0.75 ],+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 15, 1.2 ], [ 20, 4 ] ]}- },- {- "id": "bridge-railway-hatching",- "type": "line",- "metadata": {- "mapbox:group": "1444849334699.1902"- },- "source": "vector_tiles",- "source-layer": "transportation",- "filter": [- "all",- [- "==",- "brunnel",- "bridge"- ],- [- "==",- "class",- "rail"- ]- ],- "paint": {- "line-color": "#bbb",- "line-dasharray": [- 0.2,- 8- ],- "line-width": {- "base": 1.4,- "stops": [- [- 14.5,- 0- ],- [- 15,- 3- ],- [- 20,- 8- ]- ]- }+ }+ }, {+ "id" : "highway-motorway-link",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "minzoom" : 12,+ "filter" : [ "all", [ "!in", "brunnel", "bridge", "tunnel" ], [ "==", "class", "motorway_link" ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#ffffff",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 12.5, 0 ], [ 13, 1.5 ], [ 14, 2.5 ], [ 20, 11.5 ] ]}- },- {- "id": "boundary-water",- "type": "line",- "source": "vector_tiles",- "source-layer": "boundary",- "filter": [- "all",- [- "in",- "admin_level",- 2,- 4- ],- [- "==",- "maritime",- 1- ]- ],- "layout": {- "line-cap": "round",- "line-join": "round"- },- "paint": {- "line-color": "#8ca0c2",- "line-width": {- "base": 1,- "stops": [- [ 0, 0.6 ],- [ 4, 1.4 ],- [ 5, 2 ],- [ 12, 8 ]- ]- },- "line-opacity": {- "stops": [- [ 6, 0.6 ],- [ 10, 1 ]- ]- }+ }+ }, {+ "id" : "highway-link",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "minzoom" : 13,+ "filter" : [ "all", [ "!in", "brunnel", "bridge", "tunnel" ], [ "in", "class", "primary_link", "secondary_link", "tertiary_link", "trunk_link" ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round",+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "#ffffff",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 12.5, 0 ], [ 13, 1.5 ], [ 14, 2.5 ], [ 20, 11.5 ] ]}- },- {- "id": "waterway-name",- "type": "symbol",- "source": "vector_tiles",- "source-layer": "waterway",- "minzoom": 13,- "filter": [- "all",- [- "==",- "$type",- "LineString"- ],- [- "has",- "name"- ]- ],- "layout": {- "text-font": [- "Open Sans Italic"- ],- "text-size": 14,- "text-field": "{name}",- "text-max-width": 5,- "text-rotation-alignment": "map",- "symbol-placement": "line",- "text-letter-spacing": 0.2,- "symbol-spacing": 350- },- "paint": {- "text-color": "#687692",- "text-halo-width": 1.5,- "text-halo-color": "rgba(255,255,255,0.7)"+ }+ }, {+ "id" : "highway-minor",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "$type", "LineString" ], [ "all", [ "!=", "brunnel", "tunnel" ], [ "in", "class", "minor", "service", "track" ] ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#ffffff",+ "line-opacity" : 1,+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 13.5, 0 ], [ 14, 2.5 ], [ 20, 11.5 ] ]}- },- {- "id": "water-name-lakeline",- "type": "symbol",- "source": "vector_tiles",- "source-layer": "water_name",- "filter": [- "==",- "$type",- "LineString"- ],- "layout": {- "text-font": [- "Open Sans Italic"- ],- "text-size": 14,- "text-field": "{name}",- "text-max-width": 5,- "text-rotation-alignment": "map",- "symbol-placement": "line",- "symbol-spacing": 350,- "text-letter-spacing": 0.2- },- "paint": {- "text-color": "#687692",- "text-halo-width": 1.5,- "text-halo-color": "rgba(255,255,255,0.7)"+ }+ }, {+ "id" : "highway-secondary-tertiary",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "!in", "brunnel", "bridge", "tunnel" ], [ "in", "class", "secondary", "tertiary" ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round",+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "#ffffff",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 6.5, 0 ], [ 8, 0.5 ], [ 20, 13 ] ]}- },- {- "id": "water-name-ocean",- "type": "symbol",- "source": "vector_tiles",- "source-layer": "water_name",- "filter": [- "all",- [- "==",- "$type",- "Point"- ],- [- "==",- "class",- "ocean"- ]- ],- "layout": {- "text-font": [- "Open Sans Italic"- ],- "text-size": 14,- "text-field": "{name}",- "text-max-width": 5,- "text-rotation-alignment": "map",- "symbol-placement": "point",- "symbol-spacing": 350,- "text-letter-spacing": 0.2- },- "paint": {- "text-color": "#687692",- "text-halo-width": 1.5,- "text-halo-color": "rgba(255,255,255,0.7)"+ }+ }, {+ "id" : "highway-trunk-primary",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "$type", "LineString" ], [ "all", [ "!in", "brunnel", "bridge", "tunnel" ], [ "in", "class", "primary", "trunk" ] ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round",+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "#ffffff",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 6.5, 0 ], [ 7, 0.5 ], [ 20, 18 ] ]}- },- {- "id": "water-name-other",- "type": "symbol",- "source": "vector_tiles",- "source-layer": "water_name",- "filter": [- "all",- [- "==",- "$type",- "Point"- ],- [- "!in",- "class",- "ocean"- ]- ],- "layout": {- "text-font": [- "Open Sans Italic"- ],- "text-size": {- "stops": [- [ 0, 10 ],- [ 6, 14 ]- ]- },- "text-field": "{name}",- "text-max-width": 5,- "text-rotation-alignment": "map",- "symbol-placement": "point",- "symbol-spacing": 350,- "text-letter-spacing": 0.2,- "visibility": "visible"- },- "paint": {- "text-color": "#687692",- "text-halo-width": 1.5,- "text-halo-color": "rgba(255,255,255,0.7)"+ }+ }, {+ "id" : "highway-motorway",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "minzoom" : 5,+ "filter" : [ "all", [ "==", "$type", "LineString" ], [ "all", [ "!in", "brunnel", "bridge", "tunnel" ], [ "==", "class", "motorway" ] ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round",+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "#ffffff",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 6.5, 0 ], [ 7, 0.5 ], [ 20, 18 ] ]}- },- {- "id": "poi-level-3",- "type": "symbol",- "source": "vector_tiles",- "source-layer": "poi",- "minzoom": 16,- "filter": [- "all",- [- "==",- "$type",- "Point"- ],- [- ">=",- "rank",- 25- ]- ],- "layout": {- "text-padding": 2,- "text-font": [- "Open Sans Semibold"- ],- "text-anchor": "top",- "icon-image": "{class}_11",- "text-field": "{name}",- "text-offset": [- 0,- 0.6- ],- "text-size": 12,- "text-max-width": 9- },- "paint": {- "text-halo-blur": 0.5,- "text-color": "#999",- "text-halo-width": 1,- "text-halo-color": "#ffffff"+ }+ }, {+ "id" : "railway-service",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "$type", "LineString" ], [ "all", [ "==", "class", "rail" ], [ "has", "service" ] ] ],+ "paint" : {+ "line-color" : "hsla(0, 0%, 73%, 0.77)",+ "line-width" : {+ "base" : 1.4,+ "stops" : [ [ 14, 0.4 ], [ 20, 1 ] ]}- },- {- "id": "poi-level-2",- "type": "symbol",- "source": "vector_tiles",- "source-layer": "poi",- "minzoom": 15,- "filter": [- "all",- [- "==",- "$type",- "Point"- ],- [- "all",- [- "<=",- "rank",- 24- ],- [- ">=",- "rank",- 15- ]- ]- ],- "layout": {- "text-padding": 2,- "text-font": [- "Open Sans Semibold"- ],- "text-anchor": "top",- "icon-image": "{class}_11",- "text-field": "{name}",- "text-offset": [- 0,- 0.6- ],- "text-size": 12,- "text-max-width": 9- },- "paint": {- "text-halo-blur": 0.5,- "text-color": "#999",- "text-halo-width": 1,- "text-halo-color": "#ffffff"+ }+ }, {+ "id" : "railway-service-hatching",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "$type", "LineString" ], [ "all", [ "==", "class", "rail" ], [ "has", "service" ] ] ],+ "layout" : {+ "visibility" : "visible"+ },+ "paint" : {+ "line-color" : "hsla(0, 0%, 73%, 0.68)",+ "line-dasharray" : [ 0.2, 8 ],+ "line-width" : {+ "base" : 1.4,+ "stops" : [ [ 14.5, 0 ], [ 15, 2 ], [ 20, 6 ] ]}- },- {- "id": "poi-level-1",- "type": "symbol",- "source": "vector_tiles",- "source-layer": "poi",- "minzoom": 14,- "filter": [- "all",- [- "==",- "$type",- "Point"- ],- [- "all",- [- "<=",- "rank",- 14- ],- [- "has",- "name"- ]- ]- ],- "layout": {- "text-padding": 2,- "text-font": [- "Open Sans Semibold"- ],- "text-anchor": "top",- "icon-image": "{class}_11",- "text-field": "{name}",- "text-offset": [- 0,- 0.6- ],- "text-size": 12,- "text-max-width": 9- },- "paint": {- "text-halo-blur": 0.5,- "text-color": "#999",- "text-halo-width": 1,- "text-halo-color": "#ffffff"+ }+ }, {+ "id" : "railway",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "$type", "LineString" ], [ "all", [ "!has", "service" ], [ "!in", "brunnel", "bridge", "tunnel" ], [ "==", "class", "rail" ] ] ],+ "paint" : {+ "line-color" : "#bbb",+ "line-width" : {+ "base" : 1.4,+ "stops" : [ [ 14, 0.4 ], [ 15, 0.75 ], [ 20, 2 ] ]}- },- {- "id": "highway-name-path",- "type": "symbol",- "source": "vector_tiles",- "source-layer": "transportation_name",- "minzoom": 15.5,- "filter": [- "==",- "class",- "path"- ],- "layout": {- "text-size": {- "base": 1,- "stops": [- [- 13,- 12- ],- [- 14,- 13- ]- ]- },- "text-font": [- "Open Sans Regular"- ],- "text-field": "{name}",- "symbol-placement": "line",- "text-rotation-alignment": "map"- },- "paint": {- "text-halo-color": "#f8f4f0",- "text-color": "#444",- "text-halo-width": 0.5+ }+ }, {+ "id" : "railway-hatching",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849345966.4436"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "$type", "LineString" ], [ "all", [ "!has", "service" ], [ "!in", "brunnel", "bridge", "tunnel" ], [ "==", "class", "rail" ] ] ],+ "paint" : {+ "line-color" : "#bbb",+ "line-dasharray" : [ 0.2, 8 ],+ "line-width" : {+ "base" : 1.4,+ "stops" : [ [ 14.5, 0 ], [ 15, 3 ], [ 20, 8 ] ]}- },- {- "id": "highway-name-minor",- "type": "symbol",- "source": "vector_tiles",- "source-layer": "transportation_name",- "minzoom": 15,- "filter": [- "all",- [- "==",- "$type",- "LineString"- ],- [- "in",- "class",- "minor",- "service",- "track"- ]- ],- "layout": {- "text-size": {- "base": 1,- "stops": [- [- 13,- 12- ],- [- 14,- 13- ]- ]- },- "text-font": [- "Open Sans Regular"- ],- "text-field": "{name}",- "symbol-placement": "line",- "text-rotation-alignment": "map"- },- "paint": {- "text-halo-blur": 0.5,- "text-color": "#666",- "text-halo-width": 1+ }+ }, {+ "id" : "bridge-motorway-link-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849334699.1902"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "bridge" ], [ "==", "class", "motorway_link" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#777",+ "line-opacity" : 1,+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 12, 1 ], [ 13, 3 ], [ 14, 4 ], [ 20, 15 ] ]}- },- {- "id": "highway-name-major",- "type": "symbol",- "source": "vector_tiles",- "source-layer": "transportation_name",- "minzoom": 12.2,- "filter": [- "in",- "class",- "primary",- "secondary",- "tertiary",- "trunk"- ],- "layout": {- "text-size": {- "base": 1,- "stops": [- [- 13,- 12- ],- [- 14,- 13- ]- ]- },- "text-font": [- "Open Sans Regular"- ],- "text-field": "{name}",- "symbol-placement": "line",- "text-rotation-alignment": "map"- },- "paint": {- "text-halo-blur": 0.5,- "text-color": "#666",- "text-halo-width": 1+ }+ }, {+ "id" : "bridge-link-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849334699.1902"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "bridge" ], [ "in", "class", "primary_link", "secondary_link", "tertiary_link", "trunk_link" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#666",+ "line-opacity" : 1,+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 12, 1 ], [ 13, 3 ], [ 14, 4 ], [ 20, 15 ] ]}- },- {- "id": "highway-shield",- "type": "symbol",- "source": "vector_tiles",- "source-layer": "transportation_name",- "minzoom": 8,- "filter": [- "all",- [- "<=",- "ref_length",- 6- ],- [- "==",- "$type",- "LineString"- ],- [- "!in",- "network",- "us-interstate",- "us-highway",- "us-state"- ]- ],- "layout": {- "text-size": 12,- "icon-image": "road_{ref_length}",- "icon-rotation-alignment": "viewport",- "symbol-spacing": 200,- "text-font": [- "Open Sans Semibold"- ],- "symbol-placement": {- "base": 1,- "stops": [- [- 10,- "point"- ],- [- 11,- "line"- ]- ]- },- "text-rotation-alignment": "viewport",- "icon-size": 1,- "text-field": "{ref}"- },- "paint": {- "text-color": "#666"+ }+ }, {+ "id" : "bridge-secondary-tertiary-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849334699.1902"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "bridge" ], [ "in", "class", "secondary", "tertiary" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#777",+ "line-opacity" : 1,+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 8, 1.5 ], [ 20, 28 ] ]}- },- {- "id": "highway-shield-us-interstate",- "type": "symbol",- "source": "vector_tiles",- "source-layer": "transportation_name",- "minzoom": 7,- "filter": [- "all",- [- "<=",- "ref_length",- 6- ],- [- "==",- "$type",- "LineString"- ],- [- "in",- "network",- "us-interstate"- ]- ],- "layout": {- "text-size": 10,- "icon-image": "{network}_{ref_length}",- "icon-rotation-alignment": "viewport",- "symbol-spacing": 200,- "text-font": [- "Open Sans Semibold"- ],- "symbol-placement": {- "base": 1,- "stops": [- [- 7,- "point"- ],- [- 7,- "line"- ],- [- 8,- "line"- ]- ]- },- "text-rotation-alignment": "viewport",- "icon-size": 1,- "text-field": "{ref}"- },- "paint": {- "text-color": "rgba(0, 0, 0, 1)"+ }+ }, {+ "id" : "bridge-trunk-primary-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849334699.1902"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "bridge" ], [ "in", "class", "primary", "trunk" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#777",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 5, 0.4 ], [ 6, 0.6 ], [ 7, 1.5 ], [ 20, 26 ] ]}- },- {- "id": "highway-shield-us-other",- "type": "symbol",- "source": "vector_tiles",- "source-layer": "transportation_name",- "minzoom": 9,- "filter": [- "all",- [- "<=",- "ref_length",- 6- ],- [- "==",- "$type",- "LineString"- ],- [- "in",- "network",- "us-highway",- "us-state"- ]- ],- "layout": {- "text-size": 10,- "icon-image": "{network}_{ref_length}",- "icon-rotation-alignment": "viewport",- "symbol-spacing": 200,- "text-font": [- "Open Sans Semibold"- ],- "symbol-placement": {- "base": 1,- "stops": [- [- 10,- "point"- ],- [- 11,- "line"- ]- ]- },- "text-rotation-alignment": "viewport",- "icon-size": 1,- "text-field": "{ref}"- },- "paint": {- "text-color": "rgba(0, 0, 0, 1)"+ }+ }, {+ "id" : "bridge-motorway-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849334699.1902"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "bridge" ], [ "==", "class", "motorway" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#777",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 5, 0.4 ], [ 6, 0.6 ], [ 7, 1.5 ], [ 20, 22 ] ]}- },- {- "id": "place-other",- "type": "symbol",- "metadata": {- "mapbox:group": "1444849242106.713"- },- "source": "vector_tiles",- "source-layer": "place",- "filter": [- "!in",- "class",- "city",- "town",- "village"- ],- "layout": {- "text-letter-spacing": 0.1,- "text-size": {- "base": 1.2,- "stops": [- [- 12,- 10- ],- [- 15,- 14- ]- ]- },- "text-font": [- "Open Sans Bold"- ],- "text-field": "{name_en}",- "text-transform": "uppercase",- "text-max-width": 9- },- "paint": {- "text-color": "#888",- "text-halo-width": 1.2,- "text-halo-color": "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "bridge-path-casing",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849334699.1902"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "$type", "LineString" ], [ "all", [ "==", "brunnel", "bridge" ], [ "==", "class", "path" ] ] ],+ "paint" : {+ "line-color" : "#777",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 15, 1.2 ], [ 20, 18 ] ]}- },- {- "id": "place-village",- "type": "symbol",- "metadata": {- "mapbox:group": "1444849242106.713"- },- "source": "vector_tiles",- "source-layer": "place",- "filter": [- "==",- "class",- "village"- ],- "layout": {- "text-font": [- "Open Sans Regular"- ],- "text-size": {- "base": 1.2,- "stops": [- [- 10,- 12- ],- [- 15,- 22- ]- ]- },- "text-field": "{name_en}",- "text-max-width": 8- },- "paint": {- "text-color": "#444",- "text-halo-width": 1.2,- "text-halo-color": "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "bridge-path",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849334699.1902"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "$type", "LineString" ], [ "all", [ "==", "brunnel", "bridge" ], [ "==", "class", "path" ] ] ],+ "paint" : {+ "line-color" : "#ddd",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 15, 1.2 ], [ 20, 4 ] ]+ },+ "line-dasharray" : [ 1.5, 0.75 ]+ }+ }, {+ "id" : "bridge-motorway-link",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849334699.1902"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "bridge" ], [ "==", "class", "motorway_link" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#ffffff",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 12.5, 0 ], [ 13, 1.5 ], [ 14, 2.5 ], [ 20, 11.5 ] ]}- },- {- "id": "place-town",- "type": "symbol",- "metadata": {- "mapbox:group": "1444849242106.713"- },- "source": "vector_tiles",- "source-layer": "place",- "filter": [- "==",- "class",- "town"- ],- "layout": {- "text-font": [- "Open Sans Regular"- ],- "text-size": {- "base": 1.2,- "stops": [- [- 10,- 14- ],- [- 15,- 24- ]- ]- },- "text-field": "{name_en}",- "text-max-width": 8- },- "paint": {- "text-color": "#444",- "text-halo-width": 1.2,- "text-halo-color": "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "bridge-link",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849334699.1902"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "bridge" ], [ "in", "class", "primary_link", "secondary_link", "tertiary_link", "trunk_link" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#ffffff",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 12.5, 0 ], [ 13, 1.5 ], [ 14, 2.5 ], [ 20, 11.5 ] ]}- },- {- "id": "place-city",- "type": "symbol",- "metadata": {- "mapbox:group": "1444849242106.713"- },- "source": "vector_tiles",- "source-layer": "place",- "filter": [- "all",- [- "!=",- "capital",- 2- ],- [- "==",- "class",- "city"- ]- ],- "layout": {- "text-font": [- "Open Sans Semibold"- ],- "text-size": {- "base": 1.2,- "stops": [- [- 7,- 14- ],- [- 11,- 24- ]- ]- },- "text-field": "{name_en}",- "text-max-width": 8- },- "paint": {- "text-color": "#666",- "text-halo-width": 1.2,- "text-halo-color": "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "bridge-secondary-tertiary",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849334699.1902"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "bridge" ], [ "in", "class", "secondary", "tertiary" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#f5f5f5",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 6.5, 0 ], [ 7, 0.5 ], [ 20, 20 ] ]}- },- {- "id": "place-city-capital",- "type": "symbol",- "metadata": {- "mapbox:group": "1444849242106.713"- },- "source": "vector_tiles",- "source-layer": "place",- "filter": [- "all",- [- "==",- "capital",- 2- ],- [- "==",- "class",- "city"- ]- ],- "layout": {- "text-font": [- "Open Sans Semibold"- ],- "text-size": {- "base": 1.2,- "stops": [- [- 7,- 14- ],- [- 11,- 24- ]- ]- },- "text-field": "{name_en}",- "text-max-width": 8,- "icon-image": "star_11",- "text-offset": [- 0.4,- 0- ],- "icon-size": 0.8,- "text-anchor": "left"- },- "paint": {- "text-color": "#444",- "text-halo-width": 1.2,- "text-halo-color": "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "bridge-trunk-primary",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849334699.1902"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "bridge" ], [ "in", "class", "primary", "trunk" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#f0f0f0",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 6.5, 0 ], [ 7, 0.5 ], [ 20, 18 ] ]}- },- {- "id": "place-country-3",- "type": "symbol",- "metadata": {- "mapbox:group": "1444849242106.713"- },- "source": "vector_tiles",- "source-layer": "place",- "filter": [- "all",- [- "==",- "class",- "country"- ],- [- ">=",- "rank",- 3- ]- ],- "layout": {- "text-font": [- "Open Sans Bold"- ],- "text-field": "{name_en}",- "text-size": {- "stops": [- [- 3,- 11- ],- [- 7,- 17- ]- ]- },- "text-transform": "uppercase",- "text-max-width": 6.25- },- "paint": {- "text-halo-blur": 1,- "text-color": "#444",- "text-halo-width": 2,- "text-halo-color": "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "bridge-motorway",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849334699.1902"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "bridge" ], [ "==", "class", "motorway" ] ],+ "layout" : {+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#f0f0f0",+ "line-width" : {+ "base" : 1.2,+ "stops" : [ [ 6.5, 0 ], [ 7, 0.5 ], [ 20, 18 ] ]}- },- {- "id": "place-country-2",- "type": "symbol",- "metadata": {- "mapbox:group": "1444849242106.713"- },- "source": "vector_tiles",- "source-layer": "place",- "filter": [- "all",- [- "==",- "class",- "country"- ],- [- "==",- "rank",- 2- ]- ],- "layout": {- "text-font": [- "Open Sans Bold"- ],- "text-field": "{name_en}",- "text-size": {- "stops": [- [- 2,- 11- ],- [- 5,- 17- ]- ]- },- "text-transform": "uppercase",- "text-max-width": 6.25- },- "paint": {- "text-halo-blur": 1,- "text-color": "#444",- "text-halo-width": 2,- "text-halo-color": "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "bridge-railway",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849334699.1902"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "bridge" ], [ "==", "class", "rail" ] ],+ "paint" : {+ "line-color" : "#f0f0f0",+ "line-width" : {+ "base" : 1.4,+ "stops" : [ [ 14, 0.4 ], [ 15, 0.75 ], [ 20, 2 ] ]}- },- {- "id": "place-country-1",- "type": "symbol",- "metadata": {- "mapbox:group": "1444849242106.713"- },- "source": "vector_tiles",- "source-layer": "place",- "filter": [- "all",- [- "==",- "class",- "country"- ],- [- "==",- "rank",- 1- ]- ],- "layout": {- "text-font": [- "Open Sans Bold"- ],- "text-field": "{name_en}",- "text-size": {- "stops": [- [- 1,- 11- ],- [- 4,- 17- ]- ]- },- "text-transform": "uppercase",- "text-max-width": 6.25- },- "paint": {- "text-halo-blur": 1,- "text-color": "#444",- "text-halo-width": 2,- "text-halo-color": "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "bridge-railway-hatching",+ "type" : "line",+ "metadata" : {+ "mapbox:group" : "1444849334699.1902"+ },+ "source" : "vector_tiles",+ "source-layer" : "transportation",+ "filter" : [ "all", [ "==", "brunnel", "bridge" ], [ "==", "class", "rail" ] ],+ "paint" : {+ "line-color" : "#bbb",+ "line-dasharray" : [ 0.2, 8 ],+ "line-width" : {+ "base" : 1.4,+ "stops" : [ [ 14.5, 0 ], [ 15, 3 ], [ 20, 8 ] ]}- },- {- "id": "place-continent",- "type": "symbol",- "metadata": {- "mapbox:group": "1444849242106.713"- },- "source": "vector_tiles",- "source-layer": "place",- "maxzoom": 1,- "filter": [- "==",- "class",- "continent"- ],- "layout": {- "text-font": [- "Open Sans Bold"- ],- "text-field": "{name_en}",- "text-size": 14,- "text-max-width": 6.25,- "text-transform": "uppercase"- },- "paint": {- "text-halo-blur": 1,- "text-color": "#444",- "text-halo-width": 2,- "text-halo-color": "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "boundary-water",+ "type" : "line",+ "source" : "vector_tiles",+ "source-layer" : "boundary",+ "filter" : [ "all", [ "in", "admin_level", 2, 4 ], [ "==", "maritime", 1 ] ],+ "layout" : {+ "line-cap" : "round",+ "line-join" : "round"+ },+ "paint" : {+ "line-color" : "#8ca0c2",+ "line-width" : {+ "base" : 1,+ "stops" : [ [ 0, 0.6 ], [ 4, 1.4 ], [ 5, 2 ], [ 12, 8 ] ]+ },+ "line-opacity" : {+ "stops" : [ [ 6, 0.6 ], [ 10, 1 ] ]}}- ]+ }, {+ "id" : "waterway-name",+ "type" : "symbol",+ "source" : "vector_tiles",+ "source-layer" : "waterway",+ "minzoom" : 13,+ "filter" : [ "all", [ "==", "$type", "LineString" ], [ "has", "name" ] ],+ "layout" : {+ "text-font" : [ "Open Sans Italic" ],+ "text-size" : 14,+ "text-field" : "{name}",+ "text-max-width" : 5,+ "text-rotation-alignment" : "map",+ "symbol-placement" : "line",+ "text-letter-spacing" : 0.2,+ "symbol-spacing" : 350+ },+ "paint" : {+ "text-color" : "#687692",+ "text-halo-width" : 1.5,+ "text-halo-color" : "rgba(255,255,255,0.7)"+ }+ }, {+ "id" : "water-name-lakeline",+ "type" : "symbol",+ "source" : "vector_tiles",+ "source-layer" : "water_name",+ "filter" : [ "==", "$type", "LineString" ],+ "layout" : {+ "text-font" : [ "Open Sans Italic" ],+ "text-size" : 14,+ "text-field" : "{name}",+ "text-max-width" : 5,+ "text-rotation-alignment" : "map",+ "symbol-placement" : "line",+ "symbol-spacing" : 350,+ "text-letter-spacing" : 0.2+ },+ "paint" : {+ "text-color" : "#687692",+ "text-halo-width" : 1.5,+ "text-halo-color" : "rgba(255,255,255,0.7)"+ }+ }, {+ "id" : "water-name-ocean",+ "type" : "symbol",+ "source" : "vector_tiles",+ "source-layer" : "water_name",+ "filter" : [ "all", [ "==", "$type", "Point" ], [ "==", "class", "ocean" ] ],+ "layout" : {+ "text-font" : [ "Open Sans Italic" ],+ "text-size" : 14,+ "text-field" : "{name}",+ "text-max-width" : 5,+ "text-rotation-alignment" : "map",+ "symbol-placement" : "point",+ "symbol-spacing" : 350,+ "text-letter-spacing" : 0.2+ },+ "paint" : {+ "text-color" : "#687692",+ "text-halo-width" : 1.5,+ "text-halo-color" : "rgba(255,255,255,0.7)"+ }+ }, {+ "id" : "water-name-other",+ "type" : "symbol",+ "source" : "vector_tiles",+ "source-layer" : "water_name",+ "filter" : [ "all", [ "==", "$type", "Point" ], [ "!in", "class", "ocean" ] ],+ "layout" : {+ "text-font" : [ "Open Sans Italic" ],+ "text-size" : {+ "stops" : [ [ 0, 10 ], [ 6, 14 ] ]+ },+ "text-field" : "{name}",+ "text-max-width" : 5,+ "text-rotation-alignment" : "map",+ "symbol-placement" : "point",+ "symbol-spacing" : 350,+ "text-letter-spacing" : 0.2,+ "visibility" : "visible"+ },+ "paint" : {+ "text-color" : "#687692",+ "text-halo-width" : 1.5,+ "text-halo-color" : "rgba(255,255,255,0.7)"+ }+ }, {+ "id" : "poi-level-3",+ "type" : "symbol",+ "source" : "vector_tiles",+ "source-layer" : "poi",+ "minzoom" : 16,+ "filter" : [ "all", [ "==", "$type", "Point" ], [ ">=", "rank", 25 ] ],+ "layout" : {+ "text-padding" : 2,+ "text-font" : [ "Open Sans Semibold" ],+ "text-anchor" : "top",+ "icon-image" : "{class}_11",+ "text-field" : "{name}",+ "text-offset" : [ 0, 0.6 ],+ "text-size" : 12,+ "text-max-width" : 9+ },+ "paint" : {+ "text-halo-blur" : 0.5,+ "text-color" : "#999",+ "text-halo-width" : 1,+ "text-halo-color" : "#ffffff"+ }+ }, {+ "id" : "poi-level-2",+ "type" : "symbol",+ "source" : "vector_tiles",+ "source-layer" : "poi",+ "minzoom" : 15,+ "filter" : [ "all", [ "==", "$type", "Point" ], [ "all", [ "<=", "rank", 24 ], [ ">=", "rank", 15 ] ] ],+ "layout" : {+ "text-padding" : 2,+ "text-font" : [ "Open Sans Semibold" ],+ "text-anchor" : "top",+ "icon-image" : "{class}_11",+ "text-field" : "{name}",+ "text-offset" : [ 0, 0.6 ],+ "text-size" : 12,+ "text-max-width" : 9+ },+ "paint" : {+ "text-halo-blur" : 0.5,+ "text-color" : "#999",+ "text-halo-width" : 1,+ "text-halo-color" : "#ffffff"+ }+ }, {+ "id" : "poi-level-1",+ "type" : "symbol",+ "source" : "vector_tiles",+ "source-layer" : "poi",+ "minzoom" : 14,+ "filter" : [ "all", [ "==", "$type", "Point" ], [ "all", [ "<=", "rank", 14 ], [ "has", "name" ] ] ],+ "layout" : {+ "text-padding" : 2,+ "text-font" : [ "Open Sans Semibold" ],+ "text-anchor" : "top",+ "icon-image" : "{class}_11",+ "text-field" : "{name}",+ "text-offset" : [ 0, 0.6 ],+ "text-size" : 12,+ "text-max-width" : 9+ },+ "paint" : {+ "text-halo-blur" : 0.5,+ "text-color" : "#999",+ "text-halo-width" : 1,+ "text-halo-color" : "#ffffff"+ }+ }, {+ "id" : "highway-name-path",+ "type" : "symbol",+ "source" : "vector_tiles",+ "source-layer" : "transportation_name",+ "minzoom" : 15.5,+ "filter" : [ "==", "class", "path" ],+ "layout" : {+ "text-size" : {+ "base" : 1,+ "stops" : [ [ 13, 12 ], [ 14, 13 ] ]+ },+ "text-font" : [ "Open Sans Regular" ],+ "text-field" : "{name}",+ "symbol-placement" : "line",+ "text-rotation-alignment" : "map"+ },+ "paint" : {+ "text-halo-color" : "#f8f4f0",+ "text-color" : "#444",+ "text-halo-width" : 0.5+ }+ }, {+ "id" : "highway-name-minor",+ "type" : "symbol",+ "source" : "vector_tiles",+ "source-layer" : "transportation_name",+ "minzoom" : 15,+ "filter" : [ "all", [ "==", "$type", "LineString" ], [ "in", "class", "minor", "service", "track" ] ],+ "layout" : {+ "text-size" : {+ "base" : 1,+ "stops" : [ [ 13, 12 ], [ 14, 13 ] ]+ },+ "text-font" : [ "Open Sans Regular" ],+ "text-field" : "{name}",+ "symbol-placement" : "line",+ "text-rotation-alignment" : "map"+ },+ "paint" : {+ "text-halo-blur" : 0.5,+ "text-color" : "#666",+ "text-halo-width" : 1+ }+ }, {+ "id" : "highway-name-major",+ "type" : "symbol",+ "source" : "vector_tiles",+ "source-layer" : "transportation_name",+ "minzoom" : 12.2,+ "filter" : [ "in", "class", "primary", "secondary", "tertiary", "trunk" ],+ "layout" : {+ "text-size" : {+ "base" : 1,+ "stops" : [ [ 13, 12 ], [ 14, 13 ] ]+ },+ "text-font" : [ "Open Sans Regular" ],+ "text-field" : "{name}",+ "symbol-placement" : "line",+ "text-rotation-alignment" : "map"+ },+ "paint" : {+ "text-halo-blur" : 0.5,+ "text-color" : "#666",+ "text-halo-width" : 1+ }+ }, {+ "id" : "highway-shield",+ "type" : "symbol",+ "source" : "vector_tiles",+ "source-layer" : "transportation_name",+ "minzoom" : 8,+ "filter" : [ "all", [ "<=", "ref_length", 6 ], [ "==", "$type", "LineString" ], [ "!in", "network", "us-interstate", "us-highway", "us-state" ] ],+ "layout" : {+ "text-size" : 12,+ "icon-image" : "road_{ref_length}",+ "icon-rotation-alignment" : "viewport",+ "symbol-spacing" : 200,+ "text-font" : [ "Open Sans Semibold" ],+ "symbol-placement" : {+ "base" : 1,+ "stops" : [ [ 10, "point" ], [ 11, "line" ] ]+ },+ "text-rotation-alignment" : "viewport",+ "icon-size" : 1,+ "text-field" : "{ref}"+ },+ "paint" : {+ "text-color" : "#666"+ }+ }, {+ "id" : "highway-shield-us-interstate",+ "type" : "symbol",+ "source" : "vector_tiles",+ "source-layer" : "transportation_name",+ "minzoom" : 7,+ "filter" : [ "all", [ "<=", "ref_length", 6 ], [ "==", "$type", "LineString" ], [ "in", "network", "us-interstate" ] ],+ "layout" : {+ "text-size" : 10,+ "icon-image" : "{network}_{ref_length}",+ "icon-rotation-alignment" : "viewport",+ "symbol-spacing" : 200,+ "text-font" : [ "Open Sans Semibold" ],+ "symbol-placement" : {+ "base" : 1,+ "stops" : [ [ 7, "point" ], [ 7, "line" ], [ 8, "line" ] ]+ },+ "text-rotation-alignment" : "viewport",+ "icon-size" : 1,+ "text-field" : "{ref}"+ },+ "paint" : {+ "text-color" : "rgba(0, 0, 0, 1)"+ }+ }, {+ "id" : "highway-shield-us-other",+ "type" : "symbol",+ "source" : "vector_tiles",+ "source-layer" : "transportation_name",+ "minzoom" : 9,+ "filter" : [ "all", [ "<=", "ref_length", 6 ], [ "==", "$type", "LineString" ], [ "in", "network", "us-highway", "us-state" ] ],+ "layout" : {+ "text-size" : 10,+ "icon-image" : "{network}_{ref_length}",+ "icon-rotation-alignment" : "viewport",+ "symbol-spacing" : 200,+ "text-font" : [ "Open Sans Semibold" ],+ "symbol-placement" : {+ "base" : 1,+ "stops" : [ [ 10, "point" ], [ 11, "line" ] ]+ },+ "text-rotation-alignment" : "viewport",+ "icon-size" : 1,+ "text-field" : "{ref}"+ },+ "paint" : {+ "text-color" : "rgba(0, 0, 0, 1)"+ }+ }, {+ "id" : "place-other",+ "type" : "symbol",+ "metadata" : {+ "mapbox:group" : "1444849242106.713"+ },+ "source" : "vector_tiles",+ "source-layer" : "place",+ "filter" : [ "!in", "class", "city", "town", "village" ],+ "layout" : {+ "text-letter-spacing" : 0.1,+ "text-size" : {+ "base" : 1.2,+ "stops" : [ [ 12, 10 ], [ 15, 14 ] ]+ },+ "text-font" : [ "Open Sans Bold" ],+ "text-field" : "{name_en}",+ "text-transform" : "uppercase",+ "text-max-width" : 9+ },+ "paint" : {+ "text-color" : "#888",+ "text-halo-width" : 1.2,+ "text-halo-color" : "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "place-village",+ "type" : "symbol",+ "metadata" : {+ "mapbox:group" : "1444849242106.713"+ },+ "source" : "vector_tiles",+ "source-layer" : "place",+ "filter" : [ "==", "class", "village" ],+ "layout" : {+ "text-font" : [ "Open Sans Regular" ],+ "text-size" : {+ "base" : 1.2,+ "stops" : [ [ 10, 12 ], [ 15, 22 ] ]+ },+ "text-field" : "{name_en}",+ "text-max-width" : 8+ },+ "paint" : {+ "text-color" : "#444",+ "text-halo-width" : 1.2,+ "text-halo-color" : "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "place-town",+ "type" : "symbol",+ "metadata" : {+ "mapbox:group" : "1444849242106.713"+ },+ "source" : "vector_tiles",+ "source-layer" : "place",+ "filter" : [ "==", "class", "town" ],+ "layout" : {+ "text-font" : [ "Open Sans Regular" ],+ "text-size" : {+ "base" : 1.2,+ "stops" : [ [ 10, 14 ], [ 15, 24 ] ]+ },+ "text-field" : "{name_en}",+ "text-max-width" : 8+ },+ "paint" : {+ "text-color" : "#444",+ "text-halo-width" : 1.2,+ "text-halo-color" : "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "place-city",+ "type" : "symbol",+ "metadata" : {+ "mapbox:group" : "1444849242106.713"+ },+ "source" : "vector_tiles",+ "source-layer" : "place",+ "filter" : [ "all", [ "!=", "capital", 2 ], [ "==", "class", "city" ] ],+ "layout" : {+ "text-font" : [ "Open Sans Semibold" ],+ "text-size" : {+ "base" : 1.2,+ "stops" : [ [ 7, 14 ], [ 11, 24 ] ]+ },+ "text-field" : "{name_en}",+ "text-max-width" : 8+ },+ "paint" : {+ "text-color" : "#666",+ "text-halo-width" : 1.2,+ "text-halo-color" : "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "place-city-capital",+ "type" : "symbol",+ "metadata" : {+ "mapbox:group" : "1444849242106.713"+ },+ "source" : "vector_tiles",+ "source-layer" : "place",+ "filter" : [ "all", [ "==", "capital", 2 ], [ "==", "class", "city" ] ],+ "layout" : {+ "text-font" : [ "Open Sans Semibold" ],+ "text-size" : {+ "base" : 1.2,+ "stops" : [ [ 7, 14 ], [ 11, 24 ] ]+ },+ "text-field" : "{name_en}",+ "text-max-width" : 8,+ "icon-image" : "star_11",+ "text-offset" : [ 0.4, 0 ],+ "icon-size" : 0.8,+ "text-anchor" : "left"+ },+ "paint" : {+ "text-color" : "#444",+ "text-halo-width" : 1.2,+ "text-halo-color" : "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "place-country-3",+ "type" : "symbol",+ "metadata" : {+ "mapbox:group" : "1444849242106.713"+ },+ "source" : "vector_tiles",+ "source-layer" : "place",+ "filter" : [ "all", [ "==", "class", "country" ], [ ">=", "rank", 3 ] ],+ "layout" : {+ "text-font" : [ "Open Sans Bold" ],+ "text-field" : "{name_en}",+ "text-size" : {+ "stops" : [ [ 3, 11 ], [ 7, 17 ] ]+ },+ "text-transform" : "uppercase",+ "text-max-width" : 6.25+ },+ "paint" : {+ "text-halo-blur" : 1,+ "text-color" : "#444",+ "text-halo-width" : 2,+ "text-halo-color" : "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "place-country-2",+ "type" : "symbol",+ "metadata" : {+ "mapbox:group" : "1444849242106.713"+ },+ "source" : "vector_tiles",+ "source-layer" : "place",+ "filter" : [ "all", [ "==", "class", "country" ], [ "==", "rank", 2 ] ],+ "layout" : {+ "text-font" : [ "Open Sans Bold" ],+ "text-field" : "{name_en}",+ "text-size" : {+ "stops" : [ [ 2, 11 ], [ 5, 17 ] ]+ },+ "text-transform" : "uppercase",+ "text-max-width" : 6.25+ },+ "paint" : {+ "text-halo-blur" : 1,+ "text-color" : "#444",+ "text-halo-width" : 2,+ "text-halo-color" : "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "place-country-1",+ "type" : "symbol",+ "metadata" : {+ "mapbox:group" : "1444849242106.713"+ },+ "source" : "vector_tiles",+ "source-layer" : "place",+ "filter" : [ "all", [ "==", "class", "country" ], [ "==", "rank", 1 ] ],+ "layout" : {+ "text-font" : [ "Open Sans Bold" ],+ "text-field" : "{name_en}",+ "text-size" : {+ "stops" : [ [ 1, 11 ], [ 4, 17 ] ]+ },+ "text-transform" : "uppercase",+ "text-max-width" : 6.25+ },+ "paint" : {+ "text-halo-blur" : 1,+ "text-color" : "#444",+ "text-halo-width" : 2,+ "text-halo-color" : "rgba(255,255,255,0.8)"+ }+ }, {+ "id" : "place-continent",+ "type" : "symbol",+ "metadata" : {+ "mapbox:group" : "1444849242106.713"+ },+ "source" : "vector_tiles",+ "source-layer" : "place",+ "maxzoom" : 1,+ "filter" : [ "==", "class", "continent" ],+ "layout" : {+ "text-font" : [ "Open Sans Bold" ],+ "text-field" : "{name_en}",+ "text-size" : 14,+ "text-max-width" : 6.25,+ "text-transform" : "uppercase"+ },+ "paint" : {+ "text-halo-blur" : 1,+ "text-color" : "#444",+ "text-halo-width" : 2,+ "text-halo-color" : "rgba(255,255,255,0.8)"+ }+ } ]}diff --git a/setup/src/demo/java/org/openremote/setup/demo/KeycloakDemoSetup.java b/setup/src/demo/java/org/openremote/setup/demo/KeycloakDemoSetup.javaindex 521fd1522..eea0bc9e7 100644--- a/setup/src/demo/java/org/openremote/setup/demo/KeycloakDemoSetup.java+++ b/setup/src/demo/java/org/openremote/setup/demo/KeycloakDemoSetup.java@@ -34,6 +34,8 @@ import java.util.logging.Logger;* <ul>* <li><code>admin</code> - The superuser in the "master" realm with all access</li>* <li><code>smartcity</code> - (Password: smartcity) A user in the "smartcity" realm with read access</li>+ * <li><code>manufacturer</code> - (Password: manufacturer) A user in the "manufacturer" realm with read access</li>+ * <li><code>manufacturer - customer</code> - (Password: customer) A user in the "manufacturer" realm with restricted access to his assets</li>** </ul>*/@@ -42,8 +44,11 @@ public class KeycloakDemoSetup extends AbstractKeycloakSetup {private static final Logger LOG = Logger.getLogger(KeycloakDemoSetup.class.getName());public String smartCityUserId;+ public static String manufacturerUserId;+ public static String customerUserId;public Realm realmMaster;public Realm realmCity;+ public static Realm realmManufacturer;public KeycloakDemoSetup(Container container) {super(container);@@ -56,7 +61,9 @@ public class KeycloakDemoSetup extends AbstractKeycloakSetup {// RealmsrealmMaster = identityService.getIdentityProvider().getRealm(Constants.MASTER_REALM);realmCity = createRealm("smartcity", "Smart City", true);+ realmManufacturer = createRealm("manufacturer", "Manufacturer", true);removeManageAccount("smartcity");+ removeManageAccount("manufacturer");// Don't allow demo users to write assetsClientRole[] demoUserRoles = Arrays.stream(AbstractKeycloakSetup.REGULAR_USER_ROLES)@@ -67,5 +74,11 @@ public class KeycloakDemoSetup extends AbstractKeycloakSetup {User smartCityUser = createUser(realmCity.getName(), "smartcity", "smartcity", "Smart", "City", null, true, demoUserRoles);this.smartCityUserId = smartCityUser.getId();keycloakProvider.updateUserRoles(realmCity.getName(), smartCityUserId, "account"); // Remove all roles for account client+ User manufacturerUser = createUser(realmManufacturer.getName(), "manufacturer", "manufacturer", "Agri", "Tech", null, true, demoUserRoles);+ manufacturerUserId = manufacturerUser.getId();+ keycloakProvider.updateUserRoles(realmManufacturer.getName(), manufacturerUserId, "account"); // Remove all roles for account client+ User customerUser = createUser(realmManufacturer.getName(), "customer", "customer", "Bert", "Frederiks", null, true, demoUserRoles);+ customerUserId = customerUser.getId();+ keycloakProvider.updateUserRoles(realmManufacturer.getName(), customerUserId, "account"); // Remove all roles for account client}}diff --git a/setup/src/demo/java/org/openremote/setup/demo/ManagerDemoSetup.java b/setup/src/demo/java/org/openremote/setup/demo/ManagerDemoSetup.javaindex a5c9187e4..1e7ebd0b6 100644--- a/setup/src/demo/java/org/openremote/setup/demo/ManagerDemoSetup.java+++ b/setup/src/demo/java/org/openremote/setup/demo/ManagerDemoSetup.java@@ -24,10 +24,14 @@ import org.openremote.agent.protocol.http.HTTPAgentLink;import org.openremote.agent.protocol.simulator.SimulatorAgent;import org.openremote.agent.protocol.simulator.SimulatorAgentLink;import org.openremote.container.util.UniqueIdentifierGenerator;+import org.openremote.manager.mqtt.ConnectionMonitorHandler;+import org.openremote.manager.security.ManagerIdentityProvider;import org.openremote.manager.setup.ManagerSetup;import org.openremote.model.Constants;import org.openremote.model.Container;import org.openremote.model.asset.Asset;+import org.openremote.model.asset.UserAssetLink;+import org.openremote.model.asset.agent.AgentLink;import org.openremote.model.asset.impl.*;import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.AttributeLink;@@ -36,12 +40,20 @@ import org.openremote.model.attribute.MetaItem;import org.openremote.model.geo.GeoJSONPoint;import org.openremote.model.security.Realm;import org.openremote.model.simulator.SimulatorReplayDatapoint;+import org.openremote.model.util.Pair;import org.openremote.model.value.*;+import org.openremote.setup.demo.model.*;+import org.openremote.setup.demo.model.HarvestRobotAsset.*;++import static org.openremote.model.Constants.*;+import static org.openremote.model.value.MetaItemType.*;import java.time.Duration;import java.time.LocalTime;import java.util.Collections;import java.util.Random;+import java.util.Arrays;+import java.util.function.Supplier;import static java.time.temporal.ChronoField.SECOND_OF_DAY;import static org.openremote.model.value.ValueType.MultivaluedStringMap;@@ -51,11 +63,20 @@ public class ManagerDemoSetup extends ManagerSetup {public static GeoJSONPoint STATIONSPLEIN_LOCATION = new GeoJSONPoint(4.470175, 51.923464);public String realmMasterName;public String realmCityName;+ public String realmManufacturerName;public String area1Id;public String smartcitySimulatorAgentId;+ public String manufacturerSimulatorAgentId;public String energyManagementId;public String weatherHttpApiAgentId;+ public String paprikaId;+ public String irrigation9Id;+ public String harvestRobot5Id;+ public String irrigation10Id;+ public String irrigation11Id;+ public String soilSensor4Id;+private final long halfHourInMillis = Duration.ofMinutes(30).toMillis();public ManagerDemoSetup(Container container) {@@ -70,6 +91,75 @@ public class ManagerDemoSetup extends ManagerSetup {return r.nextInt((max - min) + 1) + min;}+ // ################################ Realm manufacturer methods ###################################+ protected HarvestRobotAsset createDemoHarvestRobotAsset(String name, Asset<?> parent, GeoJSONPoint location,+ OperationMode operationMode, VegetableType vegetableType, int direction, int harvestedTotal, Supplier<AgentLink<?>> agentLinker) {+ HarvestRobotAsset harvestRobotAsset = new HarvestRobotAsset(name);+ harvestRobotAsset.setParent(parent);+ harvestRobotAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));+ harvestRobotAsset.getAttributes().getOrCreate(HarvestRobotAsset.OPERATION_MODE)+ .addMeta(new MetaItem<>(RULE_STATE), new MetaItem<>(READ_ONLY))+ .setValue(operationMode);+ harvestRobotAsset.getAttributes().getOrCreate(HarvestRobotAsset.VEGETABLE_TYPE)+ .addMeta(new MetaItem<>(RULE_STATE))+ .setValue(vegetableType);+ harvestRobotAsset.getAttributes().getOrCreate(HarvestRobotAsset.DIRECTION)+ .addMeta(new MetaItem<>(RULE_STATE), new MetaItem<>(READ_ONLY))+ .setValue(direction);;+ harvestRobotAsset.getAttributes().getOrCreate(HarvestRobotAsset.SPEED)+ .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()),+ new MetaItem<>(RULE_STATE), new MetaItem<>(READ_ONLY));+ harvestRobotAsset.getAttributes().getOrCreate(HarvestRobotAsset.HARVESTED_SESSION)+ .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()),+ new MetaItem<>(RULE_STATE), new MetaItem<>(READ_ONLY));+ harvestRobotAsset.getAttributes().getOrCreate(HarvestRobotAsset.HARVESTED_TOTAL)+ .addMeta(new MetaItem<>(RULE_STATE), new MetaItem<>(READ_ONLY))+ .setValue(harvestedTotal);;++ return harvestRobotAsset;+ }++ protected IrrigationAsset createDemoIrrigationAsset(String name, Asset<?> parent, GeoJSONPoint location, Supplier<AgentLink<?>> agentLinker) {+ IrrigationAsset irrigationAsset = new IrrigationAsset(name);+ irrigationAsset.setParent(parent);+ irrigationAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));+ irrigationAsset.getAttributes().getOrCreate(IrrigationAsset.FLOW_WATER)+ .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()),+ new MetaItem<>(STORE_DATA_POINTS), new MetaItem<>(RULE_STATE), new MetaItem<>(READ_ONLY));+ irrigationAsset.getAttributes().getOrCreate(IrrigationAsset.FLOW_NUTRIENTS)+ .addMeta(new MetaItem<>(STORE_DATA_POINTS), new MetaItem<>(RULE_STATE), new MetaItem<>(READ_ONLY));+ irrigationAsset.getAttributes().getOrCreate(IrrigationAsset.FLOW_TOTAL)+ .addMeta(new MetaItem<>(STORE_DATA_POINTS), new MetaItem<>(RULE_STATE), new MetaItem<>(READ_ONLY));+ irrigationAsset.getAttributes().getOrCreate(IrrigationAsset.TANK_LEVEL)+ .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()),+ new MetaItem<>(STORE_DATA_POINTS), new MetaItem<>(RULE_STATE), new MetaItem<>(READ_ONLY));++ return irrigationAsset;+ }+ protected SoilSensorAsset createDemoSoilSensorAsset(String name, Asset<?> parent, GeoJSONPoint location,+ int soilTensionMin, int soilTensionMax, Supplier<AgentLink<?>> agentLinker) {+ SoilSensorAsset soilSensorAsset = new SoilSensorAsset(name);+ soilSensorAsset.setParent(parent);+ soilSensorAsset.getAttributes().addOrReplace(new Attribute<>(Asset.LOCATION, location));+ soilSensorAsset.getAttributes().getOrCreate(SoilSensorAsset.SOIL_TENSION_MEASURED)+ .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()),+ new MetaItem<>(RULE_STATE), new MetaItem<>(STORE_DATA_POINTS), new MetaItem<>(READ_ONLY));+ soilSensorAsset.getAttributes().getOrCreate(SoilSensorAsset.SOIL_TENSION_MIN)+ .addMeta(new MetaItem<>(RULE_STATE))+ .setValue(soilTensionMin);+ soilSensorAsset.getAttributes().getOrCreate(SoilSensorAsset.SOIL_TENSION_MAX)+ .addMeta(new MetaItem<>(RULE_STATE))+ .setValue(soilTensionMax);+ soilSensorAsset.getAttributes().getOrCreate(SoilSensorAsset.TEMPERATURE)+ .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()),+ new MetaItem<>(RULE_STATE), new MetaItem<>(STORE_DATA_POINTS), new MetaItem<>(READ_ONLY));+ soilSensorAsset.getAttributes().getOrCreate(SoilSensorAsset.SALINITY)+ .addMeta(new MetaItem<>(AGENT_LINK, agentLinker.get()),+ new MetaItem<>(RULE_STATE), new MetaItem<>(STORE_DATA_POINTS), new MetaItem<>(READ_ONLY));++ return soilSensorAsset;+ }+@Overridepublic void onStart() throws Exception {super.onStart();@@ -77,17 +167,10 @@ public class ManagerDemoSetup extends ManagerSetup {KeycloakDemoSetup keycloakDemoSetup = setupService.getTaskOfType(KeycloakDemoSetup.class);Realm realmMaster = keycloakDemoSetup.realmMaster;Realm realmCity = keycloakDemoSetup.realmCity;+ Realm realmManufacturer = KeycloakDemoSetup.realmManufacturer;realmMasterName = realmMaster.getName();this.realmCityName = realmCity.getName();-- // ################################ Demo assets for 'master' realm ###################################--- // ################################ Link demo users and assets ###################################--- // ################################ Make users restricted ###################################-+ realmManufacturerName = realmManufacturer.getName();// ################################ Realm smartcity ###################################@@ -1610,6 +1693,599 @@ public class ManagerDemoSetup extends ManagerSetup {});ship1Asset.setId(UniqueIdentifierGenerator.generateId(ship1Asset.getName()));ship1Asset = assetStorageService.merge(ship1Asset);++ // ################################ Realm Manufaturer Simulator ###################################++ SimulatorAgent manufacturerSimulatorAgent = new SimulatorAgent("Simulator");+ manufacturerSimulatorAgent.setRealm(this.realmManufacturerName);++ manufacturerSimulatorAgent = assetStorageService.merge(manufacturerSimulatorAgent);+ manufacturerSimulatorAgentId = manufacturerSimulatorAgent.getId();++ // ################################ Manufacturer realm assets ###################################++ // ### Greenhouse equipment distribution ###++ Asset<?> distributor1 = new ThingAsset("GreenEquipment Distribution");+ distributor1.setRealm(this.realmManufacturerName);+ distributor1.setId(UniqueIdentifierGenerator.generateId(distributor1.getName()));+ distributor1 = assetStorageService.merge(distributor1);++ BuildingAsset vegetablesAndMore = new BuildingAsset("Vegetables & More");+ vegetablesAndMore.setParent(distributor1);+ vegetablesAndMore.setId(UniqueIdentifierGenerator.generateId(vegetablesAndMore.getName()));+ vegetablesAndMore = assetStorageService.merge(vegetablesAndMore);++ HarvestRobotAsset harvestRobot1 = createDemoHarvestRobotAsset("Robot 1", vegetablesAndMore, new GeoJSONPoint(4.279166, 51.978078), OperationMode.CUTTING, VegetableType.BELL_PEPPER, 26, 45, () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ harvestRobot1.setId(UniqueIdentifierGenerator.generateId(harvestRobot1.getName()));+ harvestRobot1 = assetStorageService.merge(harvestRobot1);+ HarvestRobotAsset harvestRobot2 = createDemoHarvestRobotAsset("Robot 2", vegetablesAndMore, new GeoJSONPoint(4.277852, 51.977487), OperationMode.SCANNING, VegetableType.BELL_PEPPER, 26, 45, () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ harvestRobot2.setId(UniqueIdentifierGenerator.generateId(harvestRobot2.getName()));+ harvestRobot2 = assetStorageService.merge(harvestRobot2);+ SoilSensorAsset soilSensor1 = createDemoSoilSensorAsset("Water sensor", vegetablesAndMore, new GeoJSONPoint(4.279010, 51.977391), 41, 53, () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ soilSensor1.setId(UniqueIdentifierGenerator.generateId(soilSensor1.getName()));+ soilSensor1 = assetStorageService.merge(soilSensor1);++ BuildingAsset moreauHorticulture = new BuildingAsset("Qoreau Horticulture");+ moreauHorticulture.setParent(distributor1);+ moreauHorticulture.setId(UniqueIdentifierGenerator.generateId(moreauHorticulture.getName()));+ moreauHorticulture = assetStorageService.merge(moreauHorticulture);++ IrrigationAsset irrigation1 = createDemoIrrigationAsset("Soil drip 1", moreauHorticulture, new GeoJSONPoint(4.311493, 51.961554), () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ IrrigationAsset irrigation2 = createDemoIrrigationAsset("Soil drip 2", moreauHorticulture, new GeoJSONPoint(4.310893, 51.961354), () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ IrrigationAsset irrigation3 = createDemoIrrigationAsset("Soil drip 3", moreauHorticulture, new GeoJSONPoint(4.310293, 51.961154), () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ IrrigationAsset irrigation4 = createDemoIrrigationAsset("Soil drip 4", moreauHorticulture, new GeoJSONPoint(4.309617, 51.960975), () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ IrrigationAsset irrigation5 = createDemoIrrigationAsset("Soil drip 5", moreauHorticulture, new GeoJSONPoint(4.309153, 51.960901), () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ irrigation1.setId(UniqueIdentifierGenerator.generateId(irrigation1.getName()));+ irrigation1 = assetStorageService.merge(irrigation1);+ irrigation2.setId(UniqueIdentifierGenerator.generateId(irrigation2.getName()));+ irrigation2 = assetStorageService.merge(irrigation2);+ irrigation3.setId(UniqueIdentifierGenerator.generateId(irrigation3.getName()));+ irrigation3 = assetStorageService.merge(irrigation3);+ irrigation4.setId(UniqueIdentifierGenerator.generateId(irrigation4.getName()));+ irrigation4 = assetStorageService.merge(irrigation4);+ irrigation5.setId(UniqueIdentifierGenerator.generateId(irrigation5.getName()));+ irrigation5 = assetStorageService.merge(irrigation5);+ SoilSensorAsset soilSensor2 = createDemoSoilSensorAsset("Soil measurement", moreauHorticulture, new GeoJSONPoint(4.310436, 51.961354), 27, 35, () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ soilSensor2.setId(UniqueIdentifierGenerator.generateId(soilSensor2.getName()));+ soilSensor2 = assetStorageService.merge(soilSensor2);++ BuildingAsset paprika = new BuildingAsset("Paprika Perfect BV");+ paprika.setParent(distributor1);+ paprika.getAttributes().getOrCreate("flowPerMeter", ValueType.NUMBER)+ .addMeta(new MetaItem<>(READ_ONLY), new MetaItem<>(RULE_STATE), new MetaItem<>(STORE_DATA_POINTS),+ new MetaItem<>(UNITS, Constants.units(UNITS_LITRE, UNITS_PER, UNITS_METRE, UNITS_SQUARED, UNITS_HOUR)));+ paprika.getAttribute(BuildingAsset.AREA).ifPresent(assetAttribute -> {+ assetAttribute.addMeta(new MetaItem<>(RULE_STATE))+ .setValue(1800);});+ paprika.getAttributes().stream().forEach(assetAttribute -> {+ assetAttribute.addMeta(new MetaItem<>(ACCESS_RESTRICTED_READ), new MetaItem<>(ACCESS_RESTRICTED_WRITE));});+ paprika.setId(UniqueIdentifierGenerator.generateId(paprika.getName()));+ paprikaId = paprika.getId();+ paprika = assetStorageService.merge(paprika);++ HarvestRobotAsset harvestRobot5 = createDemoHarvestRobotAsset("Harvest Robot 1", paprika, new GeoJSONPoint(4.282415, 51.975951), OperationMode.UNLOADING, VegetableType.TOMATO, 26, 45, () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ harvestRobot5.getAttributes().stream().forEach(assetAttribute -> {+ assetAttribute.addMeta(new MetaItem<>(ACCESS_RESTRICTED_READ), new MetaItem<>(ACCESS_RESTRICTED_WRITE));});+ harvestRobot5.getAttribute(HarvestRobotAsset.HARVESTED_SESSION).ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(+ MetaItemType.AGENT_LINK,+ new SimulatorAgentLink(manufacturerSimulatorAgentId).setReplayData(+ new SimulatorReplayDatapoint[]{+ new SimulatorReplayDatapoint(midnight.plusHours(6).get(SECOND_OF_DAY), 814),+ new SimulatorReplayDatapoint(midnight.plusHours(6).plusMinutes(30).get(SECOND_OF_DAY), 814),+ new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), 815),+ new SimulatorReplayDatapoint(midnight.plusHours(7).plusMinutes(30).get(SECOND_OF_DAY), 816),+ new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), 816),+ new SimulatorReplayDatapoint(midnight.plusHours(8).plusMinutes(30).get(SECOND_OF_DAY), 816),+ new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), 816),+ new SimulatorReplayDatapoint(midnight.plusHours(9).plusMinutes(30).get(SECOND_OF_DAY), 817),+ new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), 818),+ new SimulatorReplayDatapoint(midnight.plusHours(10).plusMinutes(30).get(SECOND_OF_DAY), 819),+ new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), 820),+ new SimulatorReplayDatapoint(midnight.plusHours(11).plusMinutes(30).get(SECOND_OF_DAY), 821),+ new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), 0),+ new SimulatorReplayDatapoint(midnight.plusHours(12).plusMinutes(30).get(SECOND_OF_DAY), 11),+ new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), 34),+ new SimulatorReplayDatapoint(midnight.plusHours(13).plusMinutes(30).get(SECOND_OF_DAY), 86),+ new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), 112),+ new SimulatorReplayDatapoint(midnight.plusHours(14).plusMinutes(30).get(SECOND_OF_DAY), 156),+ new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), 289),+ new SimulatorReplayDatapoint(midnight.plusHours(15).plusMinutes(30).get(SECOND_OF_DAY), 348),+ new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), 456),+ new SimulatorReplayDatapoint(midnight.plusHours(16).plusMinutes(30).get(SECOND_OF_DAY), 516),+ new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), 624),+ new SimulatorReplayDatapoint(midnight.plusHours(17).plusMinutes(30).get(SECOND_OF_DAY), 684),+ new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), 713),+ new SimulatorReplayDatapoint(midnight.plusHours(18).plusMinutes(30).get(SECOND_OF_DAY), 762),+ new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), 787),+ new SimulatorReplayDatapoint(midnight.plusHours(19).plusMinutes(30).get(SECOND_OF_DAY), 792),+ new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), 798),+ new SimulatorReplayDatapoint(midnight.plusHours(20).plusMinutes(30).get(SECOND_OF_DAY), 804),+ new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), 808),+ new SimulatorReplayDatapoint(midnight.plusHours(21).plusMinutes(30).get(SECOND_OF_DAY), 812),+ new SimulatorReplayDatapoint(midnight.plusHours(22).get(SECOND_OF_DAY), 813),+ new SimulatorReplayDatapoint(midnight.plusHours(22).plusMinutes(30).get(SECOND_OF_DAY), 813),+ new SimulatorReplayDatapoint(midnight.plusHours(23).get(SECOND_OF_DAY), 814),+ new SimulatorReplayDatapoint(midnight.plusHours(23).plusMinutes(30).get(SECOND_OF_DAY), 814)+ }+ )+ )+ );+ });+ harvestRobot5.getAttribute(HarvestRobotAsset.SPEED).ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(+ MetaItemType.AGENT_LINK,+ new SimulatorAgentLink(manufacturerSimulatorAgentId).setReplayData(+ new SimulatorReplayDatapoint[]{+ new SimulatorReplayDatapoint(midnight.plusHours(6).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(6).plusMinutes(30).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(7).plusMinutes(30).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(8).plusMinutes(30).get(SECOND_OF_DAY), 1),+ new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(9).plusMinutes(30).get(SECOND_OF_DAY), 1),+ new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(10).plusMinutes(30).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(11).plusMinutes(30).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(12).plusMinutes(30).get(SECOND_OF_DAY), 8),+ new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), 7),+ new SimulatorReplayDatapoint(midnight.plusHours(13).plusMinutes(30).get(SECOND_OF_DAY), 9),+ new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), 10),+ new SimulatorReplayDatapoint(midnight.plusHours(14).plusMinutes(30).get(SECOND_OF_DAY), 9),+ new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), 9),+ new SimulatorReplayDatapoint(midnight.plusHours(15).plusMinutes(30).get(SECOND_OF_DAY), 9),+ new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), 10),+ new SimulatorReplayDatapoint(midnight.plusHours(16).plusMinutes(30).get(SECOND_OF_DAY), 11),+ new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), 11),+ new SimulatorReplayDatapoint(midnight.plusHours(17).plusMinutes(30).get(SECOND_OF_DAY), 11),+ new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), 9),+ new SimulatorReplayDatapoint(midnight.plusHours(18).plusMinutes(30).get(SECOND_OF_DAY), 8),+ new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), 8),+ new SimulatorReplayDatapoint(midnight.plusHours(19).plusMinutes(30).get(SECOND_OF_DAY), 5),+ new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(20).plusMinutes(30).get(SECOND_OF_DAY), 6),+ new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), 4),+ new SimulatorReplayDatapoint(midnight.plusHours(21).plusMinutes(30).get(SECOND_OF_DAY), 4),+ new SimulatorReplayDatapoint(midnight.plusHours(22).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(22).plusMinutes(30).get(SECOND_OF_DAY), 1),+ new SimulatorReplayDatapoint(midnight.plusHours(23).get(SECOND_OF_DAY), 1),+ new SimulatorReplayDatapoint(midnight.plusHours(23).plusMinutes(30).get(SECOND_OF_DAY), 1)+ }+ )+ )+ );+ });+ harvestRobot5.setId(UniqueIdentifierGenerator.generateId(harvestRobot5.getName()));+ harvestRobot5Id = harvestRobot5.getId();+ harvestRobot5 = assetStorageService.merge(harvestRobot5);++ IrrigationAsset irrigation9 = createDemoIrrigationAsset("Irrigation 1", paprika, new GeoJSONPoint(4.283731, 51.976526), () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ irrigation9.getAttributes().stream().forEach(assetAttribute -> {+ assetAttribute.addMeta(new MetaItem<>(ACCESS_RESTRICTED_READ), new MetaItem<>(ACCESS_RESTRICTED_WRITE));});+ irrigation9.getAttribute(IrrigationAsset.TANK_LEVEL).ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(+ MetaItemType.AGENT_LINK,+ new SimulatorAgentLink(manufacturerSimulatorAgentId).setReplayData(+ new SimulatorReplayDatapoint[]{+ new SimulatorReplayDatapoint(midnight.plusHours(6).get(SECOND_OF_DAY), 1000),+ new SimulatorReplayDatapoint(midnight.plusHours(6).plusMinutes(30).get(SECOND_OF_DAY), 995),+ new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), 990),+ new SimulatorReplayDatapoint(midnight.plusHours(7).plusMinutes(30).get(SECOND_OF_DAY), 986),+ new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), 980),+ new SimulatorReplayDatapoint(midnight.plusHours(8).plusMinutes(30).get(SECOND_OF_DAY), 975),+ new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), 970),+ new SimulatorReplayDatapoint(midnight.plusHours(9).plusMinutes(30).get(SECOND_OF_DAY), 965),+ new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), 960),+ new SimulatorReplayDatapoint(midnight.plusHours(10).plusMinutes(30).get(SECOND_OF_DAY), 956),+ new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), 950),+ new SimulatorReplayDatapoint(midnight.plusHours(11).plusMinutes(30).get(SECOND_OF_DAY), 945),+ new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), 941),+ new SimulatorReplayDatapoint(midnight.plusHours(12).plusMinutes(30).get(SECOND_OF_DAY), 936),+ new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), 929),+ new SimulatorReplayDatapoint(midnight.plusHours(13).plusMinutes(30).get(SECOND_OF_DAY), 925),+ new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), 919),+ new SimulatorReplayDatapoint(midnight.plusHours(14).plusMinutes(30).get(SECOND_OF_DAY), 914),+ new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), 910),+ new SimulatorReplayDatapoint(midnight.plusHours(15).plusMinutes(30).get(SECOND_OF_DAY), 906),+ new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), 900),+ new SimulatorReplayDatapoint(midnight.plusHours(16).plusMinutes(30).get(SECOND_OF_DAY), 895),+ new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), 891),+ new SimulatorReplayDatapoint(midnight.plusHours(17).plusMinutes(30).get(SECOND_OF_DAY), 1200),+ new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), 1195),+ new SimulatorReplayDatapoint(midnight.plusHours(18).plusMinutes(30).get(SECOND_OF_DAY), 1190),+ new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), 1184),+ new SimulatorReplayDatapoint(midnight.plusHours(19).plusMinutes(30).get(SECOND_OF_DAY), 1173),+ new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), 1145),+ new SimulatorReplayDatapoint(midnight.plusHours(20).plusMinutes(30).get(SECOND_OF_DAY), 1105),+ new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), 1074),+ new SimulatorReplayDatapoint(midnight.plusHours(21).plusMinutes(30).get(SECOND_OF_DAY), 1032),+ new SimulatorReplayDatapoint(midnight.plusHours(22).get(SECOND_OF_DAY), 1027),+ new SimulatorReplayDatapoint(midnight.plusHours(22).plusMinutes(30).get(SECOND_OF_DAY), 1022),+ new SimulatorReplayDatapoint(midnight.plusHours(23).get(SECOND_OF_DAY), 1017),+ new SimulatorReplayDatapoint(midnight.plusHours(23).plusMinutes(30).get(SECOND_OF_DAY), 1006)+ }+ )+ )+ );+ });+ irrigation9.getAttribute(IrrigationAsset.FLOW_WATER).ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(+ MetaItemType.AGENT_LINK,+ new SimulatorAgentLink(manufacturerSimulatorAgentId).setReplayData(+ new SimulatorReplayDatapoint[]{+ new SimulatorReplayDatapoint(midnight.plusHours(6).get(SECOND_OF_DAY), 10),+ new SimulatorReplayDatapoint(midnight.plusHours(6).plusMinutes(30).get(SECOND_OF_DAY), 10.5),+ new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), 11),+ new SimulatorReplayDatapoint(midnight.plusHours(7).plusMinutes(30).get(SECOND_OF_DAY), 10.8),+ new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), 12),+ new SimulatorReplayDatapoint(midnight.plusHours(8).plusMinutes(30).get(SECOND_OF_DAY), 11.3),+ new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), 10),+ new SimulatorReplayDatapoint(midnight.plusHours(9).plusMinutes(30).get(SECOND_OF_DAY), 11.9),+ new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), 12),+ new SimulatorReplayDatapoint(midnight.plusHours(10).plusMinutes(30).get(SECOND_OF_DAY), 12.5),+ new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), 11),+ new SimulatorReplayDatapoint(midnight.plusHours(11).plusMinutes(30).get(SECOND_OF_DAY), 10.8),+ new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), 11),+ new SimulatorReplayDatapoint(midnight.plusHours(12).plusMinutes(30).get(SECOND_OF_DAY), 9.6),+ new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), 9),+ new SimulatorReplayDatapoint(midnight.plusHours(13).plusMinutes(30).get(SECOND_OF_DAY), 9.4),+ new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), 9),+ new SimulatorReplayDatapoint(midnight.plusHours(14).plusMinutes(30).get(SECOND_OF_DAY), 10.4),+ new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), 10),+ new SimulatorReplayDatapoint(midnight.plusHours(15).plusMinutes(30).get(SECOND_OF_DAY), 11.8),+ new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), 11),+ new SimulatorReplayDatapoint(midnight.plusHours(16).plusMinutes(30).get(SECOND_OF_DAY), 12.3),+ new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), 11),+ new SimulatorReplayDatapoint(midnight.plusHours(17).plusMinutes(30).get(SECOND_OF_DAY), 12.1),+ new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), 11),+ new SimulatorReplayDatapoint(midnight.plusHours(18).plusMinutes(30).get(SECOND_OF_DAY), 11.3),+ new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), 11),+ new SimulatorReplayDatapoint(midnight.plusHours(19).plusMinutes(30).get(SECOND_OF_DAY), 11.7),+ new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), 10),+ new SimulatorReplayDatapoint(midnight.plusHours(20).plusMinutes(30).get(SECOND_OF_DAY), 10.2),+ new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), 10.3),+ new SimulatorReplayDatapoint(midnight.plusHours(21).plusMinutes(30).get(SECOND_OF_DAY), 10.1),+ new SimulatorReplayDatapoint(midnight.plusHours(22).get(SECOND_OF_DAY), 10),+ new SimulatorReplayDatapoint(midnight.plusHours(22).plusMinutes(30).get(SECOND_OF_DAY), 9),+ new SimulatorReplayDatapoint(midnight.plusHours(23).get(SECOND_OF_DAY), 10.2),+ new SimulatorReplayDatapoint(midnight.plusHours(23).plusMinutes(30).get(SECOND_OF_DAY), 10.1)+ }+ )+ )+ );+ });+ irrigation9.setId(UniqueIdentifierGenerator.generateId(irrigation9.getName()));+ irrigation9Id = irrigation9.getId();+ irrigation9 = assetStorageService.merge(irrigation9);+ IrrigationAsset irrigation10 = createDemoIrrigationAsset("Irrigation 2", paprika, new GeoJSONPoint(4.285047, 51.975652), () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ irrigation10.getAttributes().stream().forEach(assetAttribute -> {+ assetAttribute.addMeta(new MetaItem<>(ACCESS_RESTRICTED_READ), new MetaItem<>(ACCESS_RESTRICTED_WRITE));});+ irrigation10.getAttribute(IrrigationAsset.TANK_LEVEL).ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(+ MetaItemType.AGENT_LINK,+ new SimulatorAgentLink(manufacturerSimulatorAgentId).setReplayData(+ new SimulatorReplayDatapoint[]{+ new SimulatorReplayDatapoint(midnight.plusHours(6).get(SECOND_OF_DAY), 1200),+ new SimulatorReplayDatapoint(midnight.plusHours(6).plusMinutes(30).get(SECOND_OF_DAY), 1193),+ new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), 1185),+ new SimulatorReplayDatapoint(midnight.plusHours(7).plusMinutes(30).get(SECOND_OF_DAY), 1178),+ new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), 1170),+ new SimulatorReplayDatapoint(midnight.plusHours(8).plusMinutes(30).get(SECOND_OF_DAY), 1162),+ new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), 1155),+ new SimulatorReplayDatapoint(midnight.plusHours(9).plusMinutes(30).get(SECOND_OF_DAY), 1148),+ new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), 1140),+ new SimulatorReplayDatapoint(midnight.plusHours(10).plusMinutes(30).get(SECOND_OF_DAY), 1132),+ new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), 1124),+ new SimulatorReplayDatapoint(midnight.plusHours(11).plusMinutes(30).get(SECOND_OF_DAY), 1117),+ new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), 1110),+ new SimulatorReplayDatapoint(midnight.plusHours(12).plusMinutes(30).get(SECOND_OF_DAY), 1102),+ new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), 1093),+ new SimulatorReplayDatapoint(midnight.plusHours(13).plusMinutes(30).get(SECOND_OF_DAY), 1085),+ new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), 1076),+ new SimulatorReplayDatapoint(midnight.plusHours(14).plusMinutes(30).get(SECOND_OF_DAY), 1070),+ new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), 1063),+ new SimulatorReplayDatapoint(midnight.plusHours(15).plusMinutes(30).get(SECOND_OF_DAY), 1055),+ new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), 1048),+ new SimulatorReplayDatapoint(midnight.plusHours(16).plusMinutes(30).get(SECOND_OF_DAY), 1041),+ new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), 1035),+ new SimulatorReplayDatapoint(midnight.plusHours(17).plusMinutes(30).get(SECOND_OF_DAY), 1028),+ new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), 1022),+ new SimulatorReplayDatapoint(midnight.plusHours(18).plusMinutes(30).get(SECOND_OF_DAY), 1021),+ new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), 1018),+ new SimulatorReplayDatapoint(midnight.plusHours(19).plusMinutes(30).get(SECOND_OF_DAY), 1015),+ new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), 1010),+ new SimulatorReplayDatapoint(midnight.plusHours(20).plusMinutes(30).get(SECOND_OF_DAY), 1002),+ new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), 995),+ new SimulatorReplayDatapoint(midnight.plusHours(21).plusMinutes(30).get(SECOND_OF_DAY), 1050),+ new SimulatorReplayDatapoint(midnight.plusHours(22).get(SECOND_OF_DAY), 1150),+ new SimulatorReplayDatapoint(midnight.plusHours(22).plusMinutes(30).get(SECOND_OF_DAY), 1290),+ new SimulatorReplayDatapoint(midnight.plusHours(23).get(SECOND_OF_DAY), 1250),+ new SimulatorReplayDatapoint(midnight.plusHours(23).plusMinutes(30).get(SECOND_OF_DAY), 1210)+ }+ )+ )+ );+ });+ irrigation10.getAttribute(IrrigationAsset.FLOW_WATER).ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(+ MetaItemType.AGENT_LINK,+ new SimulatorAgentLink(manufacturerSimulatorAgentId).setReplayData(+ new SimulatorReplayDatapoint[]{+ new SimulatorReplayDatapoint(midnight.plusHours(6).get(SECOND_OF_DAY), 12),+ new SimulatorReplayDatapoint(midnight.plusHours(6).plusMinutes(30).get(SECOND_OF_DAY), 12.5),+ new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), 13),+ new SimulatorReplayDatapoint(midnight.plusHours(7).plusMinutes(30).get(SECOND_OF_DAY), 12.6),+ new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), 14.2),+ new SimulatorReplayDatapoint(midnight.plusHours(8).plusMinutes(30).get(SECOND_OF_DAY), 13.3),+ new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), 12),+ new SimulatorReplayDatapoint(midnight.plusHours(9).plusMinutes(30).get(SECOND_OF_DAY), 14),+ new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), 14.1),+ new SimulatorReplayDatapoint(midnight.plusHours(10).plusMinutes(30).get(SECOND_OF_DAY), 14.5),+ new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), 13),+ new SimulatorReplayDatapoint(midnight.plusHours(11).plusMinutes(30).get(SECOND_OF_DAY), 12.8),+ new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), 13.2),+ new SimulatorReplayDatapoint(midnight.plusHours(12).plusMinutes(30).get(SECOND_OF_DAY), 11.6),+ new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), 11),+ new SimulatorReplayDatapoint(midnight.plusHours(13).plusMinutes(30).get(SECOND_OF_DAY), 11.4),+ new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), 11.2),+ new SimulatorReplayDatapoint(midnight.plusHours(14).plusMinutes(30).get(SECOND_OF_DAY), 12.3),+ new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), 12.1),+ new SimulatorReplayDatapoint(midnight.plusHours(15).plusMinutes(30).get(SECOND_OF_DAY), 13.8),+ new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), 13),+ new SimulatorReplayDatapoint(midnight.plusHours(16).plusMinutes(30).get(SECOND_OF_DAY), 12.3),+ new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), 13.1),+ new SimulatorReplayDatapoint(midnight.plusHours(17).plusMinutes(30).get(SECOND_OF_DAY), 14.1),+ new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), 13),+ new SimulatorReplayDatapoint(midnight.plusHours(18).plusMinutes(30).get(SECOND_OF_DAY), 13.2),+ new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), 12.9),+ new SimulatorReplayDatapoint(midnight.plusHours(19).plusMinutes(30).get(SECOND_OF_DAY), 13.7),+ new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), 11.8),+ new SimulatorReplayDatapoint(midnight.plusHours(20).plusMinutes(30).get(SECOND_OF_DAY), 12.1),+ new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), 12.6),+ new SimulatorReplayDatapoint(midnight.plusHours(21).plusMinutes(30).get(SECOND_OF_DAY), 12),+ new SimulatorReplayDatapoint(midnight.plusHours(22).get(SECOND_OF_DAY), 12.1),+ new SimulatorReplayDatapoint(midnight.plusHours(22).plusMinutes(30).get(SECOND_OF_DAY), 11),+ new SimulatorReplayDatapoint(midnight.plusHours(23).get(SECOND_OF_DAY), 12.2),+ new SimulatorReplayDatapoint(midnight.plusHours(23).plusMinutes(30).get(SECOND_OF_DAY), 12.1)+ }+ )+ )+ );+ });+ irrigation10.setId(UniqueIdentifierGenerator.generateId(irrigation10.getName()));+ irrigation10Id = irrigation10.getId();+ irrigation10 = assetStorageService.merge(irrigation10);+ IrrigationAsset irrigation11 = createDemoIrrigationAsset("Irrigation 3", paprika, new GeoJSONPoint(4.286504, 51.974613), () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ irrigation11.getAttributes().stream().forEach(assetAttribute -> {+ assetAttribute.addMeta(new MetaItem<>(ACCESS_RESTRICTED_READ), new MetaItem<>(ACCESS_RESTRICTED_WRITE));});+ irrigation11.getAttribute(IrrigationAsset.TANK_LEVEL).ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(+ MetaItemType.AGENT_LINK,+ new SimulatorAgentLink(manufacturerSimulatorAgentId).setReplayData(+ new SimulatorReplayDatapoint[]{+ new SimulatorReplayDatapoint(midnight.plusHours(6).get(SECOND_OF_DAY), 1210),+ new SimulatorReplayDatapoint(midnight.plusHours(6).plusMinutes(30).get(SECOND_OF_DAY), 1190),+ new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), 1180),+ new SimulatorReplayDatapoint(midnight.plusHours(7).plusMinutes(30).get(SECOND_OF_DAY), 1172),+ new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), 1160),+ new SimulatorReplayDatapoint(midnight.plusHours(8).plusMinutes(30).get(SECOND_OF_DAY), 1152),+ new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), 1145),+ new SimulatorReplayDatapoint(midnight.plusHours(9).plusMinutes(30).get(SECOND_OF_DAY), 1141),+ new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), 1132),+ new SimulatorReplayDatapoint(midnight.plusHours(10).plusMinutes(30).get(SECOND_OF_DAY), 1125),+ new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), 1120),+ new SimulatorReplayDatapoint(midnight.plusHours(11).plusMinutes(30).get(SECOND_OF_DAY), 1110),+ new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), 1100),+ new SimulatorReplayDatapoint(midnight.plusHours(12).plusMinutes(30).get(SECOND_OF_DAY), 1102),+ new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), 1083),+ new SimulatorReplayDatapoint(midnight.plusHours(13).plusMinutes(30).get(SECOND_OF_DAY), 1071),+ new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), 1066),+ new SimulatorReplayDatapoint(midnight.plusHours(14).plusMinutes(30).get(SECOND_OF_DAY), 1060),+ new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), 1055),+ new SimulatorReplayDatapoint(midnight.plusHours(15).plusMinutes(30).get(SECOND_OF_DAY), 1035),+ new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), 1028),+ new SimulatorReplayDatapoint(midnight.plusHours(16).plusMinutes(30).get(SECOND_OF_DAY), 1021),+ new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), 1015),+ new SimulatorReplayDatapoint(midnight.plusHours(17).plusMinutes(30).get(SECOND_OF_DAY), 1006),+ new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), 1002),+ new SimulatorReplayDatapoint(midnight.plusHours(18).plusMinutes(30).get(SECOND_OF_DAY), 1001),+ new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), 997),+ new SimulatorReplayDatapoint(midnight.plusHours(19).plusMinutes(30).get(SECOND_OF_DAY), 985),+ new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), 985),+ new SimulatorReplayDatapoint(midnight.plusHours(20).plusMinutes(30).get(SECOND_OF_DAY), 982),+ new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), 975),+ new SimulatorReplayDatapoint(midnight.plusHours(21).plusMinutes(30).get(SECOND_OF_DAY), 1040),+ new SimulatorReplayDatapoint(midnight.plusHours(22).get(SECOND_OF_DAY), 1200),+ new SimulatorReplayDatapoint(midnight.plusHours(22).plusMinutes(30).get(SECOND_OF_DAY), 1250),+ new SimulatorReplayDatapoint(midnight.plusHours(23).get(SECOND_OF_DAY), 1250),+ new SimulatorReplayDatapoint(midnight.plusHours(23).plusMinutes(30).get(SECOND_OF_DAY), 1220)+ }+ )+ )+ );+ });+ irrigation11.getAttribute(IrrigationAsset.FLOW_WATER).ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(+ MetaItemType.AGENT_LINK,+ new SimulatorAgentLink(manufacturerSimulatorAgentId).setReplayData(+ new SimulatorReplayDatapoint[]{+ new SimulatorReplayDatapoint(midnight.plusHours(6).get(SECOND_OF_DAY), 13),+ new SimulatorReplayDatapoint(midnight.plusHours(6).plusMinutes(30).get(SECOND_OF_DAY), 13.5),+ new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), 14.1),+ new SimulatorReplayDatapoint(midnight.plusHours(7).plusMinutes(30).get(SECOND_OF_DAY), 13.5),+ new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), 15),+ new SimulatorReplayDatapoint(midnight.plusHours(8).plusMinutes(30).get(SECOND_OF_DAY), 14.2),+ new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), 13.1),+ new SimulatorReplayDatapoint(midnight.plusHours(9).plusMinutes(30).get(SECOND_OF_DAY), 15.2),+ new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), 15),+ new SimulatorReplayDatapoint(midnight.plusHours(10).plusMinutes(30).get(SECOND_OF_DAY), 15.4),+ new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), 14.1),+ new SimulatorReplayDatapoint(midnight.plusHours(11).plusMinutes(30).get(SECOND_OF_DAY), 13.8),+ new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), 14.2),+ new SimulatorReplayDatapoint(midnight.plusHours(12).plusMinutes(30).get(SECOND_OF_DAY), 12.6),+ new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), 12.2),+ new SimulatorReplayDatapoint(midnight.plusHours(13).plusMinutes(30).get(SECOND_OF_DAY), 12.2),+ new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), 13.2),+ new SimulatorReplayDatapoint(midnight.plusHours(14).plusMinutes(30).get(SECOND_OF_DAY), 13.4),+ new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), 13),+ new SimulatorReplayDatapoint(midnight.plusHours(15).plusMinutes(30).get(SECOND_OF_DAY), 14.7),+ new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), 14),+ new SimulatorReplayDatapoint(midnight.plusHours(16).plusMinutes(30).get(SECOND_OF_DAY), 13.2),+ new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), 14),+ new SimulatorReplayDatapoint(midnight.plusHours(17).plusMinutes(30).get(SECOND_OF_DAY), 15),+ new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), 14.1),+ new SimulatorReplayDatapoint(midnight.plusHours(18).plusMinutes(30).get(SECOND_OF_DAY), 14),+ new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), 14.1),+ new SimulatorReplayDatapoint(midnight.plusHours(19).plusMinutes(30).get(SECOND_OF_DAY), 14.6),+ new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), 12.9),+ new SimulatorReplayDatapoint(midnight.plusHours(20).plusMinutes(30).get(SECOND_OF_DAY), 13),+ new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), 13.4),+ new SimulatorReplayDatapoint(midnight.plusHours(21).plusMinutes(30).get(SECOND_OF_DAY), 13.1),+ new SimulatorReplayDatapoint(midnight.plusHours(22).get(SECOND_OF_DAY), 12.9),+ new SimulatorReplayDatapoint(midnight.plusHours(22).plusMinutes(30).get(SECOND_OF_DAY), 12.1),+ new SimulatorReplayDatapoint(midnight.plusHours(23).get(SECOND_OF_DAY), 13.2),+ new SimulatorReplayDatapoint(midnight.plusHours(23).plusMinutes(30).get(SECOND_OF_DAY), 13.1)+ }+ )+ )+ );+ });+ irrigation11.setId(UniqueIdentifierGenerator.generateId(irrigation11.getName()));+ irrigation11Id = irrigation11.getId();+ irrigation11 = assetStorageService.merge(irrigation11);++ SoilSensorAsset soilSensor4 = createDemoSoilSensorAsset("Soil sensor", paprika, new GeoJSONPoint(4.285034, 51.973881), 34, 47, () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ soilSensor4.getAttributes().stream().forEach(assetAttribute -> {+ assetAttribute.addMeta(new MetaItem<>(ACCESS_RESTRICTED_READ), new MetaItem<>(ACCESS_RESTRICTED_WRITE));});+ soilSensor4.getAttribute(SoilSensorAsset.SALINITY).ifPresent(assetAttribute -> {+ assetAttribute.addMeta(+ new MetaItem<>(+ MetaItemType.AGENT_LINK,+ new SimulatorAgentLink(manufacturerSimulatorAgentId).setReplayData(+ new SimulatorReplayDatapoint[]{+ new SimulatorReplayDatapoint(midnight.plusHours(6).get(SECOND_OF_DAY), 2),+ new SimulatorReplayDatapoint(midnight.plusHours(6).plusMinutes(30).get(SECOND_OF_DAY), 5),+ new SimulatorReplayDatapoint(midnight.plusHours(7).get(SECOND_OF_DAY), 7),+ new SimulatorReplayDatapoint(midnight.plusHours(7).plusMinutes(30).get(SECOND_OF_DAY), 12),+ new SimulatorReplayDatapoint(midnight.plusHours(8).get(SECOND_OF_DAY), 17),+ new SimulatorReplayDatapoint(midnight.plusHours(8).plusMinutes(30).get(SECOND_OF_DAY), 22),+ new SimulatorReplayDatapoint(midnight.plusHours(9).get(SECOND_OF_DAY), 28),+ new SimulatorReplayDatapoint(midnight.plusHours(9).plusMinutes(30).get(SECOND_OF_DAY), 33),+ new SimulatorReplayDatapoint(midnight.plusHours(10).get(SECOND_OF_DAY), 32),+ new SimulatorReplayDatapoint(midnight.plusHours(10).plusMinutes(30).get(SECOND_OF_DAY), 38),+ new SimulatorReplayDatapoint(midnight.plusHours(11).get(SECOND_OF_DAY), 36),+ new SimulatorReplayDatapoint(midnight.plusHours(11).plusMinutes(30).get(SECOND_OF_DAY), 31),+ new SimulatorReplayDatapoint(midnight.plusHours(12).get(SECOND_OF_DAY), 25),+ new SimulatorReplayDatapoint(midnight.plusHours(12).plusMinutes(30).get(SECOND_OF_DAY), 28),+ new SimulatorReplayDatapoint(midnight.plusHours(13).get(SECOND_OF_DAY), 22),+ new SimulatorReplayDatapoint(midnight.plusHours(13).plusMinutes(30).get(SECOND_OF_DAY), 21),+ new SimulatorReplayDatapoint(midnight.plusHours(14).get(SECOND_OF_DAY), 22),+ new SimulatorReplayDatapoint(midnight.plusHours(14).plusMinutes(30).get(SECOND_OF_DAY), 23),+ new SimulatorReplayDatapoint(midnight.plusHours(15).get(SECOND_OF_DAY), 22),+ new SimulatorReplayDatapoint(midnight.plusHours(15).plusMinutes(30).get(SECOND_OF_DAY), 21),+ new SimulatorReplayDatapoint(midnight.plusHours(16).get(SECOND_OF_DAY), 20),+ new SimulatorReplayDatapoint(midnight.plusHours(16).plusMinutes(30).get(SECOND_OF_DAY), 18),+ new SimulatorReplayDatapoint(midnight.plusHours(17).get(SECOND_OF_DAY), 21),+ new SimulatorReplayDatapoint(midnight.plusHours(17).plusMinutes(30).get(SECOND_OF_DAY), 22),+ new SimulatorReplayDatapoint(midnight.plusHours(18).get(SECOND_OF_DAY), 19),+ new SimulatorReplayDatapoint(midnight.plusHours(18).plusMinutes(30).get(SECOND_OF_DAY), 20),+ new SimulatorReplayDatapoint(midnight.plusHours(19).get(SECOND_OF_DAY), 15),+ new SimulatorReplayDatapoint(midnight.plusHours(19).plusMinutes(30).get(SECOND_OF_DAY), 11),+ new SimulatorReplayDatapoint(midnight.plusHours(20).get(SECOND_OF_DAY), 6),+ new SimulatorReplayDatapoint(midnight.plusHours(20).plusMinutes(30).get(SECOND_OF_DAY), 7),+ new SimulatorReplayDatapoint(midnight.plusHours(21).get(SECOND_OF_DAY), 4),+ new SimulatorReplayDatapoint(midnight.plusHours(21).plusMinutes(30).get(SECOND_OF_DAY), 5),+ new SimulatorReplayDatapoint(midnight.plusHours(22).get(SECOND_OF_DAY), 3),+ new SimulatorReplayDatapoint(midnight.plusHours(22).plusMinutes(30).get(SECOND_OF_DAY), 4),+ new SimulatorReplayDatapoint(midnight.plusHours(23).get(SECOND_OF_DAY), 3),+ new SimulatorReplayDatapoint(midnight.plusHours(23).plusMinutes(30).get(SECOND_OF_DAY), 1)+ }+ )+ )+ );+ });+ soilSensor4.setId(UniqueIdentifierGenerator.generateId(soilSensor4.getName()));+ soilSensor4Id = soilSensor4.getId();+ soilSensor4 = assetStorageService.merge(soilSensor4);++ // ### Distributor 2 ###++ Asset<?> distributor2 = new ThingAsset("High-Tech Greenhouse Distribution");+ distributor2.setRealm(this.realmManufacturerName);+ distributor2.setId(UniqueIdentifierGenerator.generateId(distributor2.getName()));+ distributor2 = assetStorageService.merge(distributor2);++ BuildingAsset bertHaanen = new BuildingAsset("Haanen Vegetables BV");+ bertHaanen.setParent(distributor2);+ bertHaanen.setId(UniqueIdentifierGenerator.generateId(bertHaanen.getName()));+ bertHaanen = assetStorageService.merge(bertHaanen);++ HarvestRobotAsset harvestRobot3 = createDemoHarvestRobotAsset("Harvest", bertHaanen, new GeoJSONPoint(4.286209, 51.983544), OperationMode.UNLOADING, VegetableType.TOMATO, 26, 45, () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ harvestRobot3.setId(UniqueIdentifierGenerator.generateId(harvestRobot3.getName()));+ harvestRobot3 = assetStorageService.merge(harvestRobot3);++ BuildingAsset rtd = new BuildingAsset("RTD Vegetable Grower");+ rtd.setParent(distributor2);+ rtd.setId(UniqueIdentifierGenerator.generateId(rtd.getName()));+ rtd = assetStorageService.merge(rtd);++ HarvestRobotAsset harvestRobot4 = createDemoHarvestRobotAsset("Harvester", rtd, new GeoJSONPoint(4.408010, 51.986839), OperationMode.UNLOADING, VegetableType.TOMATO, 26, 45, () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ harvestRobot4.setId(UniqueIdentifierGenerator.generateId(harvestRobot4.getName()));+ harvestRobot4 = assetStorageService.merge(harvestRobot4);++ IrrigationAsset irrigation6 = createDemoIrrigationAsset("Irrigation N", rtd, new GeoJSONPoint(4.408287, 51.987239), () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ irrigation6.setId(UniqueIdentifierGenerator.generateId(irrigation6.getName()));+ irrigation6 = assetStorageService.merge(irrigation6);+ IrrigationAsset irrigation7 = createDemoIrrigationAsset("Irrigation S", rtd, new GeoJSONPoint(4.408313, 51.986357), () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ irrigation7.setId(UniqueIdentifierGenerator.generateId(irrigation7.getName()));+ irrigation7 = assetStorageService.merge(irrigation7);+ IrrigationAsset irrigation8 = createDemoIrrigationAsset("Irrigation W", rtd, new GeoJSONPoint(4.407037, 51.986598), () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ irrigation8.setId(UniqueIdentifierGenerator.generateId(irrigation8.getName()));+ irrigation8 = assetStorageService.merge(irrigation8);++ SoilSensorAsset soilSensor3 = createDemoSoilSensorAsset("Soil monitor", rtd, new GeoJSONPoint(4.408088, 51.986793), 44, 68, () -> new SimulatorAgentLink(manufacturerSimulatorAgentId));+ soilSensor3.setId(UniqueIdentifierGenerator.generateId(soilSensor3.getName()));+ soilSensor3 = assetStorageService.merge(soilSensor3);++ // ################################ Link users and assets ###################################++ assetStorageService.storeUserAssetLinks(Arrays.asList(+ new UserAssetLink(this.realmManufacturerName,+ KeycloakDemoSetup.customerUserId,+ paprikaId),+ new UserAssetLink(this.realmManufacturerName,+ KeycloakDemoSetup.customerUserId,+ irrigation9Id),+ new UserAssetLink(this.realmManufacturerName,+ KeycloakDemoSetup.customerUserId,+ irrigation10Id),+ new UserAssetLink(this.realmManufacturerName,+ KeycloakDemoSetup.customerUserId,+ irrigation11Id),+ new UserAssetLink(this.realmManufacturerName,+ KeycloakDemoSetup.customerUserId,+ harvestRobot5Id),+ new UserAssetLink(this.realmManufacturerName,+ KeycloakDemoSetup.customerUserId,+ soilSensor4Id)));++ // ################################ Make user restricted ###################################+ ManagerIdentityProvider identityProvider = identityService.getIdentityProvider();+ identityProvider.updateUserRealmRoles(realmManufacturer.getName(), KeycloakDemoSetup.customerUserId, identityProvider+ .addRealmRoles(realmManufacturer.getName(),+ KeycloakDemoSetup.customerUserId, RESTRICTED_USER_REALM_ROLE));}@SuppressWarnings("OptionalGetWithoutIsPresent")diff --git a/setup/src/demo/java/org/openremote/setup/demo/RulesDemoSetup.java b/setup/src/demo/java/org/openremote/setup/demo/RulesDemoSetup.javaindex af3a9a3be..533a994a2 100644--- a/setup/src/demo/java/org/openremote/setup/demo/RulesDemoSetup.java+++ b/setup/src/demo/java/org/openremote/setup/demo/RulesDemoSetup.java@@ -38,6 +38,7 @@ public class RulesDemoSetup extends ManagerSetup {}public Long realmSmartCityRulesetId;+ public Long realmManufacturerRulesetId;@Overridepublic void onStart() throws Exception {@@ -169,5 +170,54 @@ public class RulesDemoSetup extends ManagerSetup {);realmSmartCityRulesetId = rulesetStorageService.merge(ruleset).getId();}++ /// Manufacturer rules+ try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/manufacturer/FlowPerMeter.flow")) {+ String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);+ Ruleset ruleset = new RealmRuleset(+ keycloakDemoSetup.realmManufacturer.getName(), "KPI: Flow per m2", Ruleset.Lang.FLOW, rules+ );+ realmManufacturerRulesetId = rulesetStorageService.merge(ruleset).getId();+ }++ try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/manufacturer/SalinityBetween20And25.json")) {+ String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);+ Ruleset ruleset = new RealmRuleset(+ keycloakDemoSetup.realmManufacturer.getName(), "Salinity 20 < 25", Ruleset.Lang.JSON, rules+ );+ realmManufacturerRulesetId = rulesetStorageService.merge(ruleset).getId();+ }++ try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/manufacturer/SalinityGreaterThan25.json")) {+ String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);+ Ruleset ruleset = new RealmRuleset(+ keycloakDemoSetup.realmManufacturer.getName(), "Salinity > 25", Ruleset.Lang.JSON, rules+ );+ realmManufacturerRulesetId = rulesetStorageService.merge(ruleset).getId();+ }++ try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/manufacturer/SalinityLessThan3.json")) {+ String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);+ Ruleset ruleset = new RealmRuleset(+ keycloakDemoSetup.realmManufacturer.getName(), "Salinity < 3", Ruleset.Lang.JSON, rules+ );+ realmManufacturerRulesetId = rulesetStorageService.merge(ruleset).getId();+ }++ try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/manufacturer/IrrigationTankLow.json")) {+ String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);+ Ruleset ruleset = new RealmRuleset(+ keycloakDemoSetup.realmManufacturer.getName(), "Irrigation tank low", Ruleset.Lang.JSON, rules+ );+ realmManufacturerRulesetId = rulesetStorageService.merge(ruleset).getId();+ }++ try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/manufacturer/TotalFlow.flow")) {+ String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);+ Ruleset ruleset = new RealmRuleset(+ keycloakDemoSetup.realmManufacturer.getName(), "Irrigation flow total", Ruleset.Lang.FLOW, rules+ );+ realmManufacturerRulesetId = rulesetStorageService.merge(ruleset).getId();+ }}}diff --git a/setup/src/demo/java/org/openremote/setup/demo/model/HarvestRobotAsset.java b/setup/src/demo/java/org/openremote/setup/demo/model/HarvestRobotAsset.javanew file mode 100644index 000000000..83debdee3--- /dev/null+++ b/setup/src/demo/java/org/openremote/setup/demo/model/HarvestRobotAsset.java@@ -0,0 +1,80 @@+/*+ * Copyright 2020, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.setup.demo.model;++import org.openremote.model.asset.Asset;+import org.openremote.model.asset.AssetDescriptor;+import org.openremote.model.value.AttributeDescriptor;+import org.openremote.model.value.ValueDescriptor;+import org.openremote.model.value.ValueType;++import static org.openremote.model.Constants.*;++import javax.persistence.Entity;++@Entity+public class HarvestRobotAsset extends Asset<HarvestRobotAsset> {++ public enum OperationMode {+ MOVING,+ SCANNING,+ CUTTING,+ UNLOADING,+ CHARGING+ }+ public static final ValueDescriptor<OperationMode> OPERATION_MODE_VALUE = new ValueDescriptor<>("operationMode",+ OperationMode.class);+ public static final AttributeDescriptor<OperationMode> OPERATION_MODE = new AttributeDescriptor<>(+ "operationMode", OPERATION_MODE_VALUE);++ public enum VegetableType {+ TOMATO,+ CUCUMBER,+ BELL_PEPPER+ }+ public static final ValueDescriptor<VegetableType> VEGETABLE_TYPE_VALUE = new ValueDescriptor<>("vegetableType",+ VegetableType.class);+ public static final AttributeDescriptor<VegetableType> VEGETABLE_TYPE = new AttributeDescriptor<>(+ "vegetableType", VEGETABLE_TYPE_VALUE);++ public static final AttributeDescriptor<Integer> DIRECTION = new AttributeDescriptor<>("direction",+ ValueType.DIRECTION);+ public static final AttributeDescriptor<Double> SPEED = new AttributeDescriptor<>("speed",+ ValueType.POSITIVE_NUMBER)+ .withUnits(UNITS_KILO, UNITS_METRE, UNITS_PER, UNITS_HOUR);++ public static final AttributeDescriptor<Integer> HARVESTED_SESSION = new AttributeDescriptor<>("harvestedSession",+ ValueType.POSITIVE_INTEGER);+ public static final AttributeDescriptor<Integer> HARVESTED_TOTAL = new AttributeDescriptor<>("harvestedTotal",+ ValueType.POSITIVE_INTEGER);++ public static final AssetDescriptor<HarvestRobotAsset> DESCRIPTOR = new AssetDescriptor<>("robot-industrial", "38761d", HarvestRobotAsset.class);++ /**+ * For use by hydrators (i.e. JPA/Jackson)+ */+ protected HarvestRobotAsset() {+ }++ public HarvestRobotAsset(String name) {+ super(name);+ }++}diff --git a/setup/src/demo/java/org/openremote/setup/demo/model/IrrigationAsset.java b/setup/src/demo/java/org/openremote/setup/demo/model/IrrigationAsset.javanew file mode 100644index 000000000..ce3526a6f--- /dev/null+++ b/setup/src/demo/java/org/openremote/setup/demo/model/IrrigationAsset.java@@ -0,0 +1,55 @@+/*+ * Copyright 2020, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.setup.demo.model;++import org.openremote.model.asset.Asset;+import org.openremote.model.asset.AssetDescriptor;+import org.openremote.model.value.AttributeDescriptor;+import org.openremote.model.value.ValueType;++import static org.openremote.model.Constants.*;++import javax.persistence.Entity;++@Entity+public class IrrigationAsset extends Asset<IrrigationAsset> {++ public static final AttributeDescriptor<Double> FLOW_WATER = new AttributeDescriptor<>("flowWater",+ ValueType.POSITIVE_NUMBER).withUnits(UNITS_LITRE, UNITS_PER, UNITS_HOUR);+ public static final AttributeDescriptor<Double> FLOW_NUTRIENTS = new AttributeDescriptor<>("flowNutrients",+ ValueType.POSITIVE_NUMBER).withUnits(UNITS_LITRE, UNITS_PER, UNITS_HOUR);+ public static final AttributeDescriptor<Double> FLOW_TOTAL = new AttributeDescriptor<>("flowTotal",+ ValueType.POSITIVE_NUMBER).withUnits(UNITS_LITRE, UNITS_PER, UNITS_HOUR);+ public static final AttributeDescriptor<Double> TANK_LEVEL = new AttributeDescriptor<>("tankLevel",+ ValueType.POSITIVE_NUMBER).withUnits(UNITS_LITRE);++ public static final AssetDescriptor<IrrigationAsset> DESCRIPTOR = new AssetDescriptor<>("water-pump", "3d85c6", IrrigationAsset.class);++ /**+ * For use by hydrators (i.e. JPA/Jackson)+ */+ protected IrrigationAsset() {+ }++ public IrrigationAsset(String name) {+ super(name);+ }++}diff --git a/setup/src/demo/java/org/openremote/setup/demo/model/ManufacturerAssetModelProvider.java b/setup/src/demo/java/org/openremote/setup/demo/model/ManufacturerAssetModelProvider.javanew file mode 100644index 000000000..5f1959455--- /dev/null+++ b/setup/src/demo/java/org/openremote/setup/demo/model/ManufacturerAssetModelProvider.java@@ -0,0 +1,63 @@+/*+ * Copyright 2021, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.setup.demo.model;++import org.openremote.model.AssetModelProvider;+import org.openremote.model.asset.Asset;+import org.openremote.model.asset.AssetDescriptor;+import org.openremote.model.value.AttributeDescriptor;+import org.openremote.model.value.MetaItemDescriptor;+import org.openremote.model.value.ValueDescriptor;++import java.util.List;+import java.util.Map;++public class ManufacturerAssetModelProvider implements AssetModelProvider {++ @Override+ public boolean useAutoScan() {+ return true;+ }++ @Override+ public AssetDescriptor<?>[] getAssetDescriptors() {+ return new AssetDescriptor[0];+ }++ @Override+ public Map<Class<? extends Asset<?>>, List<AttributeDescriptor<?>>> getAttributeDescriptors() {+ return null;+ }++ @Override+ public Map<Class<? extends Asset<?>>, List<MetaItemDescriptor<?>>> getMetaItemDescriptors() {+ return null;+ }++ @Override+ public Map<Class<? extends Asset<?>>, List<ValueDescriptor<?>>> getValueDescriptors() {+ return null;+ }++ @Override+ public void onAssetModelFinished() {++ }+}diff --git a/setup/src/demo/java/org/openremote/setup/demo/model/SoilSensorAsset.java b/setup/src/demo/java/org/openremote/setup/demo/model/SoilSensorAsset.javanew file mode 100644index 000000000..9990907b2--- /dev/null+++ b/setup/src/demo/java/org/openremote/setup/demo/model/SoilSensorAsset.java@@ -0,0 +1,64 @@+/*+ * Copyright 2020, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.setup.demo.model;++import org.openremote.model.asset.Asset;+import org.openremote.model.asset.AssetDescriptor;+import org.openremote.model.value.AttributeDescriptor;+import org.openremote.model.value.ValueConstraint;+import org.openremote.model.value.ValueType;++import javax.persistence.Entity;++import static org.openremote.model.Constants.*;++@Entity+public class SoilSensorAsset extends Asset<SoilSensorAsset> {++ public static final AttributeDescriptor<Integer> SOIL_TENSION_MEASURED = new AttributeDescriptor<>("soilTensionMeasured",+ ValueType.POSITIVE_INTEGER)+ .withUnits(UNITS_KILO, UNITS_PASCAL);+ public static final AttributeDescriptor<Integer> SOIL_TENSION_MIN = new AttributeDescriptor<>("soilTensionMin",+ ValueType.POSITIVE_INTEGER)+ .withUnits(UNITS_KILO, UNITS_PASCAL)+ .withConstraints(new ValueConstraint.Min(0),new ValueConstraint.Max(80));+ public static final AttributeDescriptor<Integer> SOIL_TENSION_MAX = new AttributeDescriptor<>("soilTensionMax",+ ValueType.POSITIVE_INTEGER)+ .withUnits(UNITS_KILO, UNITS_PASCAL)+ .withConstraints(new ValueConstraint.Min(0),new ValueConstraint.Max(80));+ public static final AttributeDescriptor<Double> TEMPERATURE = new AttributeDescriptor<>("temperature",+ ValueType.NUMBER)+ .withUnits(UNITS_CELSIUS);+ public static final AttributeDescriptor<Double> SALINITY = new AttributeDescriptor<>("salinity",+ ValueType.NUMBER);++ public static final AssetDescriptor<SoilSensorAsset> DESCRIPTOR = new AssetDescriptor<>("water-percent", "993333", SoilSensorAsset.class);++ /**+ * For use by hydrators (i.e. JPA/Jackson)+ */+ protected SoilSensorAsset() {+ }++ public SoilSensorAsset(String name) {+ super(name);+ }++}diff --git a/setup/src/demo/resources/META-INF/services/org.openremote.model.AssetModelProvider b/setup/src/demo/resources/META-INF/services/org.openremote.model.AssetModelProvidernew file mode 100644index 000000000..8f24a2d32--- /dev/null+++ b/setup/src/demo/resources/META-INF/services/org.openremote.model.AssetModelProvider@@ -0,0 +1 @@+org.openremote.setup.demo.model.ManufacturerAssetModelProviderdiff --git a/setup/src/demo/resources/demo/rules/manufacturer/FlowPerMeter.flow b/setup/src/demo/resources/demo/rules/manufacturer/FlowPerMeter.flownew file mode 100644index 000000000..6b53c10eb--- /dev/null+++ b/setup/src/demo/resources/demo/rules/manufacturer/FlowPerMeter.flow@@ -0,0 +1 @@+{"name":"Exported on Wed Feb 08 2023 17:10:42 GMT+0100 (Central European Standard Time)","description":"","connections":[{"from":"fp95mFIcmY","to":"8nUBiX3tsf"},{"from":"UPOOjAjSf5","to":"6SprBC23_T"},{"from":"LdPPsVZ4g0","to":"jqpCePr99D"},{"from":"SzR23bYYWI","to":"hg6y2V016F"},{"from":"V07QwqrOjM","to":"37akuaTT4x"},{"from":"22Ea-H9rJt","to":"jxPmidZ4hp"},{"from":"l4u19raJj7","to":"7je2GMKIsy"}],"nodes":[{"inputs":[],"internals":[{"name":"Attribute","picker":{"type":"ASSET_ATTRIBUTE"},"value":{"assetId":"4w1CElB2Olsn17uoKA1ktn","attributeName":"area"}}],"name":"READ_ATTRIBUTE","outputs":[{"name":"value","type":"NUMBER","nodeId":"sMZ2jkMHG","id":"V07QwqrOjM"}],"type":"INPUT","position":{"x":-491.69140625,"y":255.88019801980184},"size":{"x":141.875,"y":32},"id":"sMZ2jkMHG"},{"inputs":[],"internals":[{"name":"Attribute","picker":{"type":"ASSET_ATTRIBUTE"},"value":{"assetId":"72f37OCsEYkVPdzgcKDlRL","attributeName":"flowTotal"}}],"name":"READ_ATTRIBUTE","outputs":[{"name":"value","type":"NUMBER","nodeId":"XUpkP5vJC","id":"fp95mFIcmY"}],"type":"INPUT","position":{"x":-493.69140625,"y":-66.5},"size":{"x":119.64099999999999,"y":32},"id":"XUpkP5vJC"},{"inputs":[],"internals":[{"name":"Attribute","picker":{"type":"ASSET_ATTRIBUTE"},"value":{"assetId":"7jSsUaNvM3ZQGfRqBTsOpJ","attributeName":"flowTotal"}}],"name":"READ_ATTRIBUTE","outputs":[{"name":"value","type":"NUMBER","nodeId":"u6eskO3wX","id":"UPOOjAjSf5"}],"type":"INPUT","position":{"x":-491.69140625,"y":38.5},"size":{"x":119.64099999999999,"y":32},"id":"u6eskO3wX"},{"inputs":[],"internals":[{"name":"Attribute","picker":{"type":"ASSET_ATTRIBUTE"},"value":{"assetId":"7atRfYJf83HuiHB6ZdM3ko","attributeName":"flowTotal"}}],"name":"READ_ATTRIBUTE","outputs":[{"name":"value","type":"NUMBER","nodeId":"u9V8msEJi","id":"LdPPsVZ4g0"}],"type":"INPUT","position":{"x":-492.69140625,"y":147.5},"size":{"x":119.64099999999999,"y":32},"id":"u9V8msEJi"},{"inputs":[{"name":"a","type":"NUMBER","nodeId":"ZauEuvdOH","id":"8nUBiX3tsf"},{"name":"b","type":"NUMBER","nodeId":"ZauEuvdOH","id":"6SprBC23_T"}],"internals":[],"name":"ADD_OPERATOR","displayCharacter":"+","outputs":[{"name":"c","type":"NUMBER","nodeId":"ZauEuvdOH","id":"SzR23bYYWI"}],"type":"PROCESSOR","position":{"x":-225.5,"y":17.5},"size":{"x":0,"y":0},"id":"ZauEuvdOH"},{"inputs":[{"name":"a","type":"NUMBER","nodeId":"WuAb9VWyu","id":"hg6y2V016F"},{"name":"b","type":"NUMBER","nodeId":"WuAb9VWyu","id":"jqpCePr99D"}],"internals":[],"name":"ADD_OPERATOR","displayCharacter":"+","outputs":[{"name":"c","type":"NUMBER","nodeId":"WuAb9VWyu","id":"22Ea-H9rJt"}],"type":"PROCESSOR","position":{"x":-117.5,"y":65.5},"size":{"x":0,"y":0},"id":"WuAb9VWyu"},{"inputs":[{"name":"a","type":"NUMBER","nodeId":"VS2XPRCIs","id":"jxPmidZ4hp"},{"name":"b","type":"NUMBER","nodeId":"VS2XPRCIs","id":"37akuaTT4x"}],"internals":[],"name":"DIVIDE_OPERATOR","displayCharacter":"÷","outputs":[{"name":"c","type":"NUMBER","nodeId":"VS2XPRCIs","id":"l4u19raJj7"}],"type":"PROCESSOR","position":{"x":-1.5990099009900973,"y":138.83069306930693},"size":{"x":0,"y":0},"id":"VS2XPRCIs"},{"inputs":[{"name":"value","type":"NUMBER","nodeId":"1APuVTGET","id":"7je2GMKIsy"}],"internals":[{"name":"Attribute","picker":{"type":"ASSET_ATTRIBUTE"},"value":{"assetId":"4w1CElB2Olsn17uoKA1ktn","attributeName":"flowPerMeter"}}],"name":"WRITE_ATTRIBUTE","outputs":[],"type":"OUTPUT","position":{"x":127.42740563118812,"y":109.26732673267327},"size":{"x":169.188,"y":32},"id":"1APuVTGET"}]}diff --git a/setup/src/demo/resources/demo/rules/manufacturer/IrrigationTankLow.json b/setup/src/demo/resources/demo/rules/manufacturer/IrrigationTankLow.jsonnew file mode 100644index 000000000..2d8d803e1--- /dev/null+++ b/setup/src/demo/resources/demo/rules/manufacturer/IrrigationTankLow.json@@ -0,0 +1,123 @@+{+ "rules": [+ {+ "recurrence": {+ "mins": 0+ },+ "when": {+ "operator": "OR",+ "groups": [+ {+ "operator": "AND",+ "items": [+ {+ "assets": {+ "types": [+ "IrrigationAsset"+ ],+ "attributes": {+ "items": [+ {+ "name": {+ "predicateType": "string",+ "match": "EXACT",+ "value": "tankLevel"+ },+ "value": {+ "predicateType": "number",+ "operator": "LESS_THAN",+ "value": 900+ }+ }+ ]+ },+ "ids": [+ "7atRfYJf83HuiHB6ZdM3ko"+ ]+ }+ }+ ]+ },+ {+ "operator": "AND",+ "items": [+ {+ "assets": {+ "types": [+ "IrrigationAsset"+ ],+ "attributes": {+ "items": [+ {+ "name": {+ "predicateType": "string",+ "match": "EXACT",+ "value": "tankLevel"+ },+ "value": {+ "predicateType": "number",+ "operator": "LESS_THAN",+ "value": 900+ }+ }+ ]+ },+ "ids": [+ "7jSsUaNvM3ZQGfRqBTsOpJ"+ ]+ }+ }+ ]+ },+ {+ "operator": "AND",+ "items": [+ {+ "assets": {+ "types": [+ "IrrigationAsset"+ ],+ "attributes": {+ "items": [+ {+ "name": {+ "predicateType": "string",+ "match": "EXACT",+ "value": "tankLevel"+ },+ "value": {+ "predicateType": "number",+ "operator": "LESS_THAN",+ "value": 900+ }+ }+ ]+ },+ "ids": [+ "72f37OCsEYkVPdzgcKDlRL"+ ]+ }+ }+ ]+ }+ ]+ },+ "then": [+ {+ "action": "notification",+ "target": {+ "custom": "[email protected]"+ },+ "notification": {+ "message": {+ "type": "email",+ "subject": "%RULESET_NAME%",+ "html": "%TRIGGER_ASSETS%"+ }+ }+ }+ ],+ "name": "Irrigation tank low"+ }+ ]+}diff --git a/setup/src/demo/resources/demo/rules/manufacturer/SalinityBetween20And25.json b/setup/src/demo/resources/demo/rules/manufacturer/SalinityBetween20And25.jsonnew file mode 100644index 000000000..2bd44b149--- /dev/null+++ b/setup/src/demo/resources/demo/rules/manufacturer/SalinityBetween20And25.json@@ -0,0 +1,94 @@+{+ "rules": [+ {+ "recurrence": {+ "mins": 0+ },+ "when": {+ "operator": "OR",+ "groups": [+ {+ "operator": "AND",+ "items": [+ {+ "assets": {+ "types": [+ "SoilSensorAsset"+ ],+ "attributes": {+ "items": [+ {+ "name": {+ "predicateType": "string",+ "match": "EXACT",+ "value": "salinity"+ },+ "value": {+ "predicateType": "number",+ "operator": "BETWEEN",+ "value": 20,+ "rangeValue": 25+ }+ }+ ]+ },+ "ids": [+ "2XOXVoMmDkOyLjY1JEnuoF"+ ]+ }+ }+ ]+ }+ ]+ },+ "then": [+ {+ "action": "write-attribute",+ "target": {+ "assets": {+ "ids": [+ "72f37OCsEYkVPdzgcKDlRL"+ ],+ "types": [+ "IrrigationAsset"+ ]+ }+ },+ "value": 1,+ "attributeName": "flowNutrients"+ },+ {+ "action": "write-attribute",+ "target": {+ "assets": {+ "ids": [+ "7jSsUaNvM3ZQGfRqBTsOpJ"+ ],+ "types": [+ "IrrigationAsset"+ ]+ }+ },+ "value": 1.2,+ "attributeName": "flowNutrients"+ },+ {+ "action": "write-attribute",+ "target": {+ "assets": {+ "ids": [+ "7atRfYJf83HuiHB6ZdM3ko"+ ],+ "types": [+ "IrrigationAsset"+ ]+ }+ },+ "value": 1.4,+ "attributeName": "flowNutrients"+ }+ ],+ "name": "Salinity 20 < 25"+ }+ ]+}diff --git a/setup/src/demo/resources/demo/rules/manufacturer/SalinityGreaterThan25.json b/setup/src/demo/resources/demo/rules/manufacturer/SalinityGreaterThan25.jsonnew file mode 100644index 000000000..fbda54dfb--- /dev/null+++ b/setup/src/demo/resources/demo/rules/manufacturer/SalinityGreaterThan25.json@@ -0,0 +1,93 @@+{+ "rules": [+ {+ "recurrence": {+ "mins": 0+ },+ "when": {+ "operator": "OR",+ "groups": [+ {+ "operator": "AND",+ "items": [+ {+ "assets": {+ "types": [+ "SoilSensorAsset"+ ],+ "attributes": {+ "items": [+ {+ "name": {+ "predicateType": "string",+ "match": "EXACT",+ "value": "salinity"+ },+ "value": {+ "predicateType": "number",+ "operator": "GREATER_THAN",+ "value": 25+ }+ }+ ]+ },+ "ids": [+ "2XOXVoMmDkOyLjY1JEnuoF"+ ]+ }+ }+ ]+ }+ ]+ },+ "then": [+ {+ "action": "write-attribute",+ "target": {+ "assets": {+ "ids": [+ "72f37OCsEYkVPdzgcKDlRL"+ ],+ "types": [+ "IrrigationAsset"+ ]+ }+ },+ "value": 0.5,+ "attributeName": "flowNutrients"+ },+ {+ "action": "write-attribute",+ "target": {+ "assets": {+ "ids": [+ "7jSsUaNvM3ZQGfRqBTsOpJ"+ ],+ "types": [+ "IrrigationAsset"+ ]+ }+ },+ "value": 0.7,+ "attributeName": "flowNutrients"+ },+ {+ "action": "write-attribute",+ "target": {+ "assets": {+ "ids": [+ "7atRfYJf83HuiHB6ZdM3ko"+ ],+ "types": [+ "IrrigationAsset"+ ]+ }+ },+ "value": 0.9,+ "attributeName": "flowNutrients"+ }+ ],+ "name": "Salinity > 25"+ }+ ]+}diff --git a/setup/src/demo/resources/demo/rules/manufacturer/SalinityLessThan3.json b/setup/src/demo/resources/demo/rules/manufacturer/SalinityLessThan3.jsonnew file mode 100644index 000000000..a24bee574--- /dev/null+++ b/setup/src/demo/resources/demo/rules/manufacturer/SalinityLessThan3.json@@ -0,0 +1,93 @@+{+ "rules": [+ {+ "recurrence": {+ "mins": 0+ },+ "when": {+ "operator": "OR",+ "groups": [+ {+ "operator": "AND",+ "items": [+ {+ "assets": {+ "types": [+ "SoilSensorAsset"+ ],+ "attributes": {+ "items": [+ {+ "name": {+ "predicateType": "string",+ "match": "EXACT",+ "value": "salinity"+ },+ "value": {+ "predicateType": "number",+ "operator": "LESS_THAN",+ "value": 3+ }+ }+ ]+ },+ "ids": [+ "2XOXVoMmDkOyLjY1JEnuoF"+ ]+ }+ }+ ]+ }+ ]+ },+ "then": [+ {+ "action": "write-attribute",+ "target": {+ "assets": {+ "ids": [+ "72f37OCsEYkVPdzgcKDlRL"+ ],+ "types": [+ "IrrigationAsset"+ ]+ }+ },+ "value": 2,+ "attributeName": "flowNutrients"+ },+ {+ "action": "write-attribute",+ "target": {+ "assets": {+ "ids": [+ "7jSsUaNvM3ZQGfRqBTsOpJ"+ ],+ "types": [+ "IrrigationAsset"+ ]+ }+ },+ "value": 2.5,+ "attributeName": "flowNutrients"+ },+ {+ "action": "write-attribute",+ "target": {+ "assets": {+ "ids": [+ "7atRfYJf83HuiHB6ZdM3ko"+ ],+ "types": [+ "IrrigationAsset"+ ]+ }+ },+ "value": 2.8,+ "attributeName": "flowNutrients"+ }+ ],+ "name": "Salinity < 3"+ }+ ]+}diff --git a/setup/src/demo/resources/demo/rules/manufacturer/TotalFlow.flow b/setup/src/demo/resources/demo/rules/manufacturer/TotalFlow.flownew file mode 100644index 000000000..c7e2a5ad5--- /dev/null+++ b/setup/src/demo/resources/demo/rules/manufacturer/TotalFlow.flow@@ -0,0 +1 @@+{"name":"Irrigation flow total","description":null,"connections":[{"from":"dEwbPuj8iM","to":"GOfh30lHQP"},{"from":"mJ_zJ7BAJL","to":"qs34J1LvHw"},{"from":"eb_Xl0VerR","to":"tVQmiCA97N"},{"from":"7iPfyFrqD2","to":"0U5yYfNQyW"},{"from":"FBWY9ciFvx","to":"I5TW2VSJ-P"},{"from":"Ku9TlCgFWm","to":"eY3ylR9A8g"},{"from":"DUNs7of8dJ","to":"NNYSD2qe7D"},{"from":"nUmYLnvrVT","to":"O4FTYmsLN2"},{"from":"0rxE2Az6pb","to":"B0RUK5UTvx"}],"nodes":[{"inputs":[],"internals":[{"name":"Attribute","picker":{"type":"ASSET_ATTRIBUTE"},"value":{"assetId":"72f37OCsEYkVPdzgcKDlRL","attributeName":"flowNutrients"}}],"name":"READ_ATTRIBUTE","outputs":[{"name":"value","type":"NUMBER","nodeId":"OLkjOAU0Y","id":"mJ_zJ7BAJL"}],"type":"INPUT","position":{"x":-964.222729722535,"y":-171.25475630281085},"size":{"x":146.219,"y":32},"id":"OLkjOAU0Y"},{"inputs":[],"internals":[{"name":"Attribute","picker":{"type":"ASSET_ATTRIBUTE"},"value":{"assetId":"72f37OCsEYkVPdzgcKDlRL","attributeName":"flowWater"}}],"name":"READ_ATTRIBUTE","outputs":[{"name":"value","type":"NUMBER","nodeId":"6gE-TDvFt","id":"dEwbPuj8iM"}],"type":"INPUT","position":{"x":-964.222729722535,"y":-64.5380333694229},"size":{"x":125.60900000000001,"y":32},"id":"6gE-TDvFt"},{"inputs":[],"internals":[{"name":"Attribute","picker":{"type":"ASSET_ATTRIBUTE"},"value":{"assetId":"7jSsUaNvM3ZQGfRqBTsOpJ","attributeName":"flowNutrients"}}],"name":"READ_ATTRIBUTE","outputs":[{"name":"value","type":"NUMBER","nodeId":"QJc-hbAqP","id":"FBWY9ciFvx"}],"type":"INPUT","position":{"x":-962.5288134854973,"y":72.66918183064736},"size":{"x":146.219,"y":32},"id":"QJc-hbAqP"},{"inputs":[],"internals":[{"name":"Attribute","picker":{"type":"ASSET_ATTRIBUTE"},"value":{"assetId":"7jSsUaNvM3ZQGfRqBTsOpJ","attributeName":"flowWater"}}],"name":"READ_ATTRIBUTE","outputs":[{"name":"value","type":"NUMBER","nodeId":"cURX8iyae","id":"Ku9TlCgFWm"}],"type":"INPUT","position":{"x":-962.5288134854968,"y":186.1615697121867},"size":{"x":125.60900000000001,"y":32},"id":"cURX8iyae"},{"inputs":[],"internals":[{"name":"Attribute","picker":{"type":"ASSET_ATTRIBUTE"},"value":{"assetId":"7atRfYJf83HuiHB6ZdM3ko","attributeName":"flowNutrients"}}],"name":"READ_ATTRIBUTE","outputs":[{"name":"value","type":"NUMBER","nodeId":"TAwn5NRH2","id":"nUmYLnvrVT"}],"type":"INPUT","position":{"x":-960.8348972484591,"y":321.67486867521944},"size":{"x":146.219,"y":32},"id":"TAwn5NRH2"},{"inputs":[],"internals":[{"name":"Attribute","picker":{"type":"ASSET_ATTRIBUTE"},"value":{"assetId":"7atRfYJf83HuiHB6ZdM3ko","attributeName":"flowWater"}}],"name":"READ_ATTRIBUTE","outputs":[{"name":"value","type":"NUMBER","nodeId":"_i1YC9li0","id":"0rxE2Az6pb"}],"type":"INPUT","position":{"x":-959.1409810114219,"y":431.77942408268353},"size":{"x":125.60900000000001,"y":32},"id":"_i1YC9li0"},{"inputs":[{"name":"value","type":"NUMBER","nodeId":"EannnlCyI","id":"tVQmiCA97N"}],"internals":[{"name":"Attribute","picker":{"type":"ASSET_ATTRIBUTE"},"value":{"assetId":"72f37OCsEYkVPdzgcKDlRL","attributeName":"flowTotal"}}],"name":"WRITE_ATTRIBUTE","outputs":[],"type":"OUTPUT","position":{"x":-492.1847038718263,"y":-114.03802433017361},"size":{"x":119.64099999999999,"y":32},"id":"EannnlCyI"},{"inputs":[{"name":"value","type":"NUMBER","nodeId":"ref6QzgL8","id":"0U5yYfNQyW"}],"internals":[{"name":"Attribute","picker":{"type":"ASSET_ATTRIBUTE"},"value":{"assetId":"7jSsUaNvM3ZQGfRqBTsOpJ","attributeName":"flowTotal"}}],"name":"WRITE_ATTRIBUTE","outputs":[],"type":"OUTPUT","position":{"x":-492.18470387182674,"y":135.90872709053048},"size":{"x":119.64099999999999,"y":32},"id":"ref6QzgL8"},{"inputs":[{"name":"value","type":"NUMBER","nodeId":"R-Qn__JHZ","id":"NNYSD2qe7D"}],"internals":[{"name":"Attribute","picker":{"type":"ASSET_ATTRIBUTE"},"value":{"assetId":"7atRfYJf83HuiHB6ZdM3ko","attributeName":"flowTotal"}}],"name":"WRITE_ATTRIBUTE","outputs":[],"type":"OUTPUT","position":{"x":-490.67900055001365,"y":379.83266522399094},"size":{"x":119.64099999999999,"y":32},"id":"R-Qn__JHZ"},{"inputs":[{"name":"a","type":"NUMBER","nodeId":"TNkBOgC8Z","id":"qs34J1LvHw"},{"name":"b","type":"NUMBER","nodeId":"TNkBOgC8Z","id":"GOfh30lHQP"}],"internals":[],"name":"ADD_OPERATOR","displayCharacter":"+","outputs":[{"name":"c","type":"NUMBER","nodeId":"TNkBOgC8Z","id":"eb_Xl0VerR"}],"type":"PROCESSOR","position":{"x":-645.3277999991461,"y":-85.96957863614404},"size":{"x":0,"y":0},"id":"TNkBOgC8Z"},{"inputs":[{"name":"a","type":"NUMBER","nodeId":"qie94v39d","id":"I5TW2VSJ-P"},{"name":"b","type":"NUMBER","nodeId":"qie94v39d","id":"eY3ylR9A8g"}],"internals":[],"name":"ADD_OPERATOR","displayCharacter":"+","outputs":[{"name":"c","type":"NUMBER","nodeId":"qie94v39d","id":"7iPfyFrqD2"}],"type":"PROCESSOR","position":{"x":-639.3049867118997,"y":163.97717278456005},"size":{"x":0,"y":0},"id":"qie94v39d"},{"inputs":[{"name":"a","type":"NUMBER","nodeId":"ILSzcBney","id":"O4FTYmsLN2"},{"name":"b","type":"NUMBER","nodeId":"ILSzcBney","id":"B0RUK5UTvx"}],"internals":[],"name":"ADD_OPERATOR","displayCharacter":"+","outputs":[{"name":"c","type":"NUMBER","nodeId":"ILSzcBney","id":"DUNs7of8dJ"}],"type":"PROCESSOR","position":{"x":-636.2935800682768,"y":410.9125175616437},"size":{"x":0,"y":0},"id":"ILSzcBney"}]}