From fe0f273cfdc2a771988ad1deb2d27d98d5cd9e79 Mon Sep 17 00:00:00 2001 From: Claudius Weinberger Date: Sat, 18 Apr 2015 23:13:12 -0700 Subject: [PATCH] Design modification Demo --- .../system/_admin/aardvark/APP/GruntFile.js | 5 +- .../js/collections/airportCollection.js | 2 +- .../frontend/js/lib/ammap/maps/js/usa2High.js | 20 +++-- .../frontend/js/lib/ammap/maps/js/usa2Low.js | 18 ++-- .../APP/frontend/js/lib/ammap/themes/light.js | 23 ++--- .../APP/frontend/js/views/demoView.js | 86 ++++++++++++++----- .../aardvark/APP/frontend/scss/style.scss | 3 + 7 files changed, 108 insertions(+), 49 deletions(-) diff --git a/js/apps/system/_admin/aardvark/APP/GruntFile.js b/js/apps/system/_admin/aardvark/APP/GruntFile.js index 709424eef8..52c4ab46c1 100644 --- a/js/apps/system/_admin/aardvark/APP/GruntFile.js +++ b/js/apps/system/_admin/aardvark/APP/GruntFile.js @@ -48,7 +48,7 @@ "frontend/js/lib/joi.browser.js", "frontend/js/lib/md5.js", "frontend/js/lib/ammap/ammap.js", - "frontend/js/lib/ammap/maps/js/worldLow.js", + "frontend/js/lib/ammap/maps/js/usa2High.js", "frontend/js/lib/ammap/themes/light.js", "frontend/src/ace.js", "frontend/src/theme-textmate.js", @@ -321,7 +321,8 @@ 'concat_in_order:default', 'concat_in_order:jsCluster', 'concat_in_order:htmlCluster', - 'concat_in_order:htmlStandalone' + 'concat_in_order:htmlStandalone', + 'watch' ]); diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js index 696677bbd2..decdf291de 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/collections/airportCollection.js @@ -17,7 +17,7 @@ type: "POST", url: "/_api/cursor", data: JSON.stringify({ - query: "for a in airports return {Latitude: a.Latitude, Longitude: a.Longitude, _key: a._key}" + query: "for a in airports return {Latitude: a.Latitude, Longitude: a.Longitude, Name: a.Name, City: a.City, _key: a._key}" }), contentType: "application/json", processData: false, diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/lib/ammap/maps/js/usa2High.js b/js/apps/system/_admin/aardvark/APP/frontend/js/lib/ammap/maps/js/usa2High.js index bda186a209..0b50432c22 100755 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/lib/ammap/maps/js/usa2High.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/lib/ammap/maps/js/usa2High.js @@ -5,20 +5,28 @@ AmCharts.maps.usa2High={ "defs": { "amcharts:ammap": { "projection":"mercator", - "leftLongitude":"-124.979930", + /* + "leftLongitude":"-124.979930", "topLatitude":"49.374568", "rightLongitude":"-66.983333", "bottomLatitude":"14.808396" + */ + "leftLongitude":"-124.733043", + "topLatitude":"49.374568", + "rightLongitude":"-66.999", + "bottomLatitude":"24.4395" } }, "g":{ "path":[ - { + /* + { "id":"US-AK", "title":"Alaska", "d":"M624.48,706.69v2.77v2.73v2.7v2.66v2.63v2.59v2.56v2.53v2.5v2.47v2.44v2.41v2.38v2.36v2.33v2.3v2.28v2.25v2.23v2.21v2.18v2.16v2.14v2.12v2.1v2.08v2.06v2.04v2.02v2v1.98v1.96l0.8,0.27l0.79,0.27l0.24,-0.54l0.85,0.42l0.74,0.36l0.47,-0.47l0.51,-0.5l0.69,-0.04l0.77,-0.04l0.52,-0.03v0.43l-0.19,0.71l-0.16,0.59l0.43,0.54l0.04,0.06l0.58,0.32l0.54,0.29l0.24,0.81l0.59,0.62l0.45,0.47l0.43,0.45l0.62,0.65l0.43,0.45l0.58,0.6l0.34,0.36l0.17,0.69l0.2,0.83l-0.12,0.49l0.27,0.08l0.53,-0.55l0.5,-0.34l0.62,-0.42l0.42,-0.28l0.78,-0.01l0.37,-0.83l0,-1.16l0.39,0.02l0.23,-0.16l0.1,-0.34l-0.25,-0.47l0.75,-0.22l0.54,-0.16l0.77,-0.43l0.75,-0.42l0.36,0.33l0.36,0.32l0.7,0.76l0.05,0.18l-0.05,0.36l-0.07,0.36l0.42,1l0.12,0.11l0.35,0.14l0.42,0.33l0.18,0.28l0.6,0.45l0.1,0.19l0.06,0.3l0.1,0.26l0.11,0.19l0.11,0.27l0.26,0.31l0.5,0.35l0.34,0.24l0.48,0.34l0.49,0.69l0.42,0.6l0.48,0.59l-0.07,0.47l0.49,0.72l0.52,0.91l0.4,0.81l0.28,0.45l0.34,0.65l0.41,0.79l0.47,0.9l0.36,0.57l0.47,0.8l0.23,0.48l-0.16,0.33l-0.19,0.4l0.6,0.19l0.42,0.13l-0.1,0.44l-0.14,0.59l0.47,0.23l0.32,0.16l-0.07,0.31l0.18,0.35l0.03,0.57l0.57,-0.04l0.25,-0.02l0.34,0.25l0.45,0.33l0.45,0.31l0.39,0.27l0.51,0.16l0.63,0.23l0.31,0.46l0.57,0.2l0.21,0.64l0.66,0.24l0.39,-0.16l0.14,0.26l0.11,0.3l0.03,0.38l-0.04,0.37l-0.16,0.31l-0.12,0.33l-0.08,0.36l-0.03,0.38l0.02,0.41l0.07,0.36l0.2,0.65l0.07,0.4l0.01,0.27l-0.45,0.94l-0.15,0.44l0.02,0.2l-0.33,0.46l-0.6,0.65l-0.27,0.37l-0.13,-0.12l-0.77,-0.1l-0.28,-0.82l-0.15,-0.64l-0.23,-0.56l0.01,-0.13l0.21,-0.37l0.78,-0.31l0.01,-0.12l-0.29,-0.08l-0.07,-0.13l-0.08,-0.61l0.02,-0.53l-0.02,-0.35l-0.13,-0.73l-0.19,-0.45l-0.5,-0.87l-0.04,-0.22l0.22,-0.28l0.14,-0.26l-0.85,0.45l-1.15,0.47l-0.49,0.33l-0.1,0.13l-0.04,0.11l0.09,0.31l-0.01,0.1l-0.1,0.18l-0.12,0.52l-0.25,0.55l-0.13,0.11l-0.45,-0.2l-0.12,-0.17l-0.23,-0.71l0.05,-0.19l0.17,-0.16l0.22,-0.35l0.28,-0.53l0.54,-1.36l0.35,-0.01l0.62,-0.27l-0.97,-0.14l-0.14,-0.07l-0.13,-0.19l-0.12,-0.3l-0.2,-0.34l-0.37,-0.12l-0.16,-0.12l-0.24,-0.41l-0.16,-0.18l-0.09,-0.23l-0.02,-0.27l-0.07,-0.14l-0.25,-0.05l-0.14,-0.09l-0.04,-0.7l-0.51,-0.18l-0.21,-0.16l-0.33,-0.44l-0.09,-0.21l-0.03,-0.18l0.08,-0.49l-0.04,-0.09l-0.29,0.05l-1.83,-0.76l0.1,-1.01l-0.34,-1.34l-0.36,-0.55l0.07,-0.21l0.08,-0.11l0.16,0l0.7,0.4l0.66,0.47l0.09,-0.07l-1.06,-1l-0.26,-0.3l-0.06,-0.36l0,-0.19l0.08,-0.1l0.99,0.09l0.06,-0.07l-1.01,-0.29l-0.2,0l-0.22,0.42l-0.1,0.1l-0.22,-0.02l-0.07,-0.06l-0.26,-0.51l-0.24,-0.35l-0.45,-0.49l-0.08,-0.35l-0.02,-0.52l0.06,-0.49l0.37,-1.13l0.15,-0.2l0.04,-0.12l-0.11,0.02l-0.11,0.11l-0.31,0.52l-0.31,0.86l-0.26,0.29l-0.16,-0.07l-0.24,-0.35l-0.51,-0.43l-0.59,-0.11l-0.37,-0.44l-0.55,-1.22l-0.07,-0.61l-0.07,-0.15l-0.3,-0.2l-0.18,-0.29l-0.28,-1.5l-0.37,-1.05l-0.09,-0.56l0.03,-0.55l-0.05,-0.06l-0.13,0.43l-0.03,0.23l-0.24,0.06l0.22,0.44l0.06,0.22l-0.11,-0.02l-0.23,0.06l0.39,0.74l0.17,1.15l0.26,0.84l0.17,0.68l0.08,0.52l0.11,0.49l0.3,1.08l0.04,0.22l-0.04,0.18l-0.1,0.21l-0.17,0.08l-0.53,-0.14l-0.2,-0.27l-0.29,-0.49l-0.4,-0.23l-1,0.11l-0.08,-0.04l0,-0.4l0.12,-0.72l-0.09,-0.29l-0.52,-1.06l0.01,-0.21l0.72,-0.49l-0.35,-0.04l-0.28,0.19l-0.11,-0.12l-0.17,-0.68l-0.11,-0.26l-0.05,-0.05l-0.03,0.65l0.12,0.34l0.02,0.2l-0.02,0.28l-0.07,0.2l-0.13,0.12l-0.13,0.03l-0.24,-0.14l-0.27,-0.26l-0.23,-0.12l-0.09,-0.1l-0.11,-0.29l-0.18,-0.22l-0.88,-0.28l-0.52,-0.33l-0.04,0.09l0.16,0.35l0.02,0.21l-0.13,0.06l-0.24,0.33l0.07,0.05l0.25,-0.11l0.28,0.01l0.46,0.2l0.42,0.26l0.15,0.15l0.06,0.22l0.05,0.08l0.41,0.25l0.02,0.13l-0.26,0.4l0.54,-0.04l0.32,0.14l0.4,0.61l0.14,0.34l0.02,0.44l-0.08,0.13l-0.16,0.09l-1.1,0.14l-0.4,0.52l-0.08,0.01l-0.3,-0.14l-0.55,-0.42l-0.69,-0.4l-1.57,-1.18l-0.04,-0.06l-0.02,-0.23l-0.11,-0.12l-0.21,-0.1l-0.3,-0.3l-0.38,-0.5l-0.23,-0.39l-0.09,-0.28l-0.22,-0.32l-0.71,-0.68l-0.37,-0.26l-0.33,-0.15l-0.28,-0.03l-0.08,-0.09l0.13,-0.15l0.02,-0.09l-0.63,-0.14l-0.6,-0.32l-1.52,-0.9l-0.78,-0.56l-0.46,-0.27l-0.19,-0.15l-0.09,-0.12l0.11,-0.13l0.31,-0.14l0.21,-0.15l0.33,-0.58l0.02,-0.18l-0.18,-0.42l-0.08,-0.38l0,-0.21l0.04,-0.21l0.05,-0.14l0.14,-0.13l0.1,-0.07l0.12,0.05l0.39,0.53l0.05,0.19l-0.02,0.72l0.11,0.84l0.04,-0.06l0.04,-0.28l0.02,-0.53l0.04,-0.25l0.08,-0.25l0.14,-0.13l0.43,0.08l0.2,-0.04l-0.84,-0.38l-0.53,-0.72l-0.1,-0.07l-0.29,-0.03l-0.31,0.29l-0.79,0.94l-0.22,0.17l-1,0.52l-0.67,0.1l-0.76,-0.08l-0.65,-0.17l-1.62,-0.82l-0.25,-0.19l0.38,-0.51l0.02,-0.16l-0.13,-0.52l-0.11,-0.15l-0.15,-0.08l-0.04,0.06l0,0.15l0.04,0.29L623,782.7l-0.28,0.16l-0.46,0.17l-1.44,-0.42l-1.48,-0.35l-1.32,-0.07l-1.86,0.28l-0.99,0.28l-0.58,0.03l-0.56,-0.05l-0.04,-0.19l0.25,-0.11l-0.01,-0.14l-0.32,-0.44l-0.49,-0.27l-0.65,-0.1l-0.37,-0.13l-0.09,-0.16l-0.23,-0.16l-0.37,-0.15l-0.16,-0.27l0.13,-0.83l0.13,-0.5l0.13,-0.34l0.32,-0.57l-0.11,0.04l-0.46,0.42l-0.4,0.43l-0.37,0.56l-0.22,0.26l-0.28,0.24l-0.44,-0.06l-0.6,-0.35l-0.52,-0.18l-0.43,-0.01l-0.17,-0.06l0.29,-0.31l0.17,-0.25l0.23,-0.4l0.05,-0.2l-1.57,-0.06l-0.06,-0.21l0,-0.16l-0.05,-0.13l-0.23,-0.1l-0.32,0.07l-0.52,0.25l-0.22,-0.19l0.08,-0.11l0.17,-0.08l0.34,-0.37l-0.46,-0.19l-0.24,-0.22l-0.12,-0.18l0.01,-0.65l0.12,-0.42l1.04,-0.41l-0.33,-0.16l-0.66,0.06l-0.44,0.35l-0.52,0.5l-0.35,0.19l-0.18,-0.13l-0.24,-0.04l-0.3,0.04l-0.2,0.13l-0.1,0.22l-0.12,0.14l-0.13,0.08l-0.1,-0.02l-0.14,-0.22l-0.3,-0.14l-0.15,-0.17l-0.08,0.11l-0.1,0.32l-0.11,0.16l-0.5,0.17l-0.28,-0.03l-0.33,-0.4l-0.05,-0.14l0.11,-0.34l0.73,-1.37l-0.07,0.01l-0.24,0.22l-0.47,0.55l-0.21,0.16l-0.36,0.02l-0.17,-0.06l-0.2,0.04l-0.24,0.15l-0.16,0.16l-0.07,0.18l0.05,0.03l0.36,-0.2l0.2,-0.05l0.06,0.1l-0.28,0.62l-0.17,0.59l-0.16,0.15l-0.26,-0.02l-0.28,0.06l0,0.16l0.53,0.47l0.19,0.07l0.24,0.17l0.04,0.17l-0.09,0.45l-0.07,0.18l-0.11,0.09l-0.43,-0.01l-0.14,0.05l-0.29,0.28l-0.14,0.23l0.05,0.02l0.25,-0.19l0.36,-0.1l0.48,-0.01l0.36,-0.1l0.23,-0.19l0.23,0.05l0.22,0.3l0.07,0.26l-0.09,0.22l-0.18,0.16l-0.28,0.1l-0.17,0.14l-0.07,0.19l-0.04,0.28l-0.01,0.37l0.07,0.67l-0.05,0.09l-0.1,0.05l-0.15,0.01l-0.14,0.16l-0.32,0.88L599.7,783l-0.14,-0.09l-0.12,0.01l-0.1,0.12l-0.23,0.09l-0.36,0.06l-0.3,-0.02l-0.54,-0.19l-0.22,-0.13l-0.17,-0.22l-0.48,0.23l-0.13,-0.1l-0.3,-0.61l-0.06,0.04l-0.06,0.66l-0.09,0.23l-0.3,0.48l-0.16,0.82l-0.05,0.02l-0.06,-0.12l-0.18,-0.73l-0.1,-0.16l-0.27,0.42l-0.03,0.15l0.07,0.54l-0.06,0.08l-0.54,-0.29l-0.13,-0.01l-0.04,0.05l0.19,0.42l-0.02,0.15l-0.77,0.81l-0.2,-0.03l-0.13,-0.08l-0.14,0.01l-0.49,0.3l-0.13,-0.01l-0.18,-0.18l-0.09,0.01l-0.04,0.19l-0.01,0.36l-0.18,0.34l-0.58,0.55l-0.15,0.26l-0.12,0.35l-0.09,0.03l-0.34,-0.22l-0.4,-0.15l-0.05,0.07l0.12,0.21l-0.03,0.13l-0.17,0.05l-0.22,-0.02l-0.26,-0.09l-0.37,0.1l-0.47,0.28l-0.39,-0.01l-0.55,-0.46l-0.15,-0.04l-0.05,-0.13l0.11,-0.37l0.16,-0.28l0.12,-0.13l0.52,-0.36l0.6,-0.13l0.38,-0.22l0.46,-0.45l0.24,-0.34l0.48,-0.88l-0.04,-0.07l-0.11,-0.05l-1.04,0.84l-0.15,0.08l-0.21,-0.01l-0.83,-0.32l-0.18,-0.14l-0.12,-0.4l0.23,-0.92l0.16,-0.44l0.41,-0.69l0.53,-0.74l0.19,-0.48l0.28,-1.29l-0.02,-0.59l-0.12,-0.72l0,-0.43l0.12,-0.14l1.22,-0.67l0.58,-0.5l1.12,-0.74l0.31,0.01l0.23,0.26l0.26,0.21l0.3,0.15l0.38,-0.02l0.47,-0.18l0.74,0.07l1.53,0.49l0.32,0.03l0.01,-0.06l-0.23,-0.34l-1.05,-0.2l-0.44,-0.2l-1.25,-0.88l-0.28,-0.34l0.12,-0.16l0.31,-0.13l0.1,-0.13l0.04,-0.22l0.18,-0.3l0.31,-0.39l0.47,-0.37l0.89,-0.56l-0.35,-0.02l-0.64,0.1l-0.23,0.11l-0.43,0.4l-0.17,0.28l-0.24,0.54l-0.1,0.1l-0.44,0.08l-1.2,0.06l-0.2,-0.28l-0.11,-0.04l-0.15,0.04l-1.11,0.71l-0.4,0.36l-0.28,0.41l-0.44,0.3l-0.59,0.19l-0.44,0.24l-0.47,0.47l-0.16,0.36l-0.01,0.17l0.11,0.53l-0.11,0.1l-0.27,0.04l-0.43,0.35l-0.91,1.04l-0.12,0.38l0.01,0.13l0.15,0.29l-0.1,0.19l-0.26,0.3l-0.57,0.48l-0.37,0.18l-0.24,0.01l-0.23,-0.07l-0.42,-0.31l-0.34,-0.02l-0.02,0.04l0.46,0.33l0.47,0.42l0.29,0.35l0.12,0.28l0.01,0.28l-0.1,0.29l-0.33,0.51l-0.32,0.15l-0.83,0.15l-0.27,0.12l-0.08,0.09l0.57,0.21l0.05,0.11l-0.08,0.42l-0.15,0.14l-0.47,0.25l-0.42,0.07l-0.06,-0.05l0.08,-0.33l-0.02,-0.08l-0.16,-0.07l-0.23,0.13l-0.56,0.49l-0.06,0.08l0.2,0.13l-0.04,0.11l-0.31,0.35l-0.13,0.23l-0.2,0.24l-0.91,0.72l0.07,0.18l-0.24,0.63l-0.13,0.55l0.16,0.23l0.77,0.27l0.37,0.07l0.44,0.19l0.79,0.51l0.26,0.33l0.04,0.16l-0.02,0.17l-0.09,0.23l-0.25,0.43l-0.6,0.64l-0.27,0.18l-0.41,0.14l-0.13,0.1l-0.52,0.6l-0.14,0.33l0.02,0.28l-0.1,0.2l-0.67,0.39l0.02,0.07l0.25,0.03l-0.09,0.34l-0.04,0.47l-0.12,0.08l-0.42,0l-0.54,0.18l-0.04,0.05l-0.01,0.34l-1.4,0.25l-0.31,0.64l-0.16,0.2l-0.55,0.47l-0.34,0.19l-0.38,0.11l-0.2,0.16l-0.02,0.2l-0.11,0.17l-0.33,0.29l-0.16,0.36l-0.12,0.06l-0.62,0.09l-0.12,0.11l-0.06,0.49l-0.11,0.02l-0.22,-0.11l-0.29,0.09l-0.64,0.55l-0.14,0.2l0.02,0.1l0.1,0.11l0.15,0.33l-0.01,0.22l-0.25,0.61l-0.09,0.09l-0.3,0.15l-0.12,0.34l-0.28,-0.04l-0.22,0.06l-0.15,0.22l-0.16,0.13l-0.17,0.03l-0.22,0.18l-0.26,0.32l-0.24,0.2l-0.22,0.09l-0.21,0.02l-0.21,-0.04l-0.19,0.04l-0.17,0.12l-0.16,0.19l-0.13,0.52l-0.16,0.23l-0.1,0.04l-0.21,-0.04l-0.32,-0.11l-0.33,0.04l-0.53,0.32l-0.17,0.24l0.33,0.05l0.17,0.07l0,0.07l-0.17,0.07l-0.29,0l-0.18,0.06l-0.21,0.14l-0.54,0.15l-0.21,0.11l-0.41,0.6l-0.05,0.14l0.05,0.03l0.23,-0.06l0.27,0.1l0.14,0.13l0.09,0.16l0.09,0.3l0.05,0.05l-0.52,0.5l-0.15,0.21l-0.09,0.08l-0.06,-0.06l-0.06,-0.56l-0.04,-0.1l-0.12,-0.01l-0.12,0.18l-0.26,0.66l-0.28,0.33l-2.12,0.85l-0.31,0.19l-0.06,0.36l-0.09,0.31l-0.14,0.25l-0.16,0.16l-0.04,-0.11l0.02,-0.88l-0.04,-0.17l-0.21,-0.11l-0.09,0.02l-0.13,0.05l-0.21,0.19l-0.13,0.05l-0.16,-0.02l-0.28,0.19l-0.66,0.6l-0.43,0.15l-0.11,0.13l-0.18,0.33l-0.12,0.12l-0.18,0.01l-0.24,-0.1l-0.19,0.07l-0.14,0.24l-0.15,0.09l-0.42,-0.17l-0.18,0.12l-0.24,0.31l-0.25,0.2l-0.26,0.1l-0.68,0.1l-0.27,-0.06l-0.05,-0.09l0.01,-0.39l0.11,-0.28l0.1,-0.13l0.14,-0.12l0.2,-0.01l0.37,0.09l-0.04,-0.09l-0.13,-0.11l-0.34,-0.19l-0.34,-0.1l-0.19,0.06l-0.27,0.15l-0.18,0.17l-0.1,0.2l-0.12,0.64l-0.07,0.17l-0.79,1.12l-0.31,0.34l-0.31,-0.02l-0.15,0.13l-0.21,0.28l-0.19,0.13l-0.18,-0.01l-0.14,-0.05l-0.1,-0.09l0.02,-0.09l0.13,-0.08l-0.05,-0.22l-0.23,-0.36l-0.15,-0.2l-0.29,-0.02l-0.05,0.17l0.1,0.85l-0.01,0.19l-0.18,0.24l-0.48,0.27l-0.15,-0.03l-0.43,-0.53l-0.41,-0.11l-0.03,0.17l0.09,0.35l-0.1,0.33l-0.3,0.31l-0.23,0.15l-0.15,-0.01l-0.01,-0.21l0.14,-0.42l0.04,-0.35l-0.07,-0.28l0.01,-0.22l0.08,-0.15l0.55,-0.42l0.23,-0.06l0.12,0.1l0.15,0.02l0.18,-0.07l0.12,-0.13l0.05,-0.2l0.24,-0.26l0.42,-0.31l0.48,-0.58l0.54,-0.85l0.64,-0.73l0.73,-0.62l0.79,-0.49l1.6,-0.68l0.12,0.04l-0.15,0.22l0.1,0.14l0.16,0.02l0.59,-0.11l0.23,-0.14l0.07,0.14l-0.08,0.17l-0.35,0.18l0.01,0.15l0.51,0.68l0.16,0.1l0.13,-0.01l0.06,-0.09l-0.04,-0.49l0.17,-0.09l0.35,-0.02l0.23,0.06l0.11,0.15l0.2,0.13l0.3,0.1l0.19,-0.03l0.07,-0.16l-0.13,-0.19l-0.57,-0.42l-0.16,-0.18l-0.04,-0.24l0.08,-0.31l0.18,-0.46l0.28,-0.62l0.25,-0.43l0.51,-0.49l0.34,-0.24l0.87,-0.75l1.67,-0.76l0.41,-0.49l0.56,-0.55l0.24,-0.13v0.21l0.08,0.19l0.38,0.13l0.24,0.04l0.11,-0.04l0.03,-0.2l-0.05,-0.36l-0.01,-0.34l0.03,-0.32l0.06,-0.26l0.25,-0.45l0.37,-0.52l0.51,-0.6l0.32,-0.28l0.3,-0.15l0.29,-0.26l0.5,-0.63l0.16,-0.1l0.36,-0.12l0.13,0.06l0.08,0.16l0.1,0.1l0.37,0.09l0.24,-0.14l-0.04,-0.07l-0.2,-0.05l-0.13,-0.09l-0.12,-0.37l-0.24,-0.23l-0.05,-0.26l0.04,-0.4l0.21,-0.94l0.03,-0.97l0.19,-0.56l0.37,-0.2l0.83,-0.14l-0.48,-0.25l-0.18,0l-0.31,-0.12l-0.12,-0.61l0,-0.45l0.21,-0.52l0.77,-0.88l0.84,-0.61l-0.11,-0.05l-0.1,-0.18l0.39,-1.23l0.38,-1.1l-0.51,0.94l-0.59,0.72l-1.74,0.83l-1.18,0.69l-0.56,0.17l-0.37,-0.17l-0.29,-0.66l-0.16,-0.23l-0.21,-0.43l0.09,-0.56l0.17,-0.39l0.37,-0.06l0.42,0.19l0.36,0.02l-0.46,-0.39l-0.67,-0.34l-0.3,0.11l-0.23,0.55l-0.31,0.38l-0.27,-0.13l-0.16,-0.15l0.11,0.46l-0.21,0.7l-0.08,0.48l0.3,1.26l-0.05,0.5l-0.54,0.23l-0.44,-0.41l-0.91,-1.6l-0.32,-0.46l-0.72,-0.76l-0.24,0.11l-0.3,0.37l-0.29,0.1l-0.77,-0.55l-0.36,-0.42l-0.34,-0.51l-0.52,0.28l-0.45,0.34l-0.53,0.54l-0.35,0l-0.97,0.46l-0.1,0.01l-0.14,0.25l-0.13,0.11l-0.11,0.47l-1.31,0.37l-1.29,-0.2l0.45,-0.26l0.51,-0.2l0.44,-0.49l-0.19,-0.66l-0.03,-0.34l0.01,-0.43l0.48,-0.6l-0.5,0l-0.32,0.22l-0.3,-0.45l-0.14,-0.89l0.34,-0.53l0.16,-0.41l0.14,-0.56l0.01,-0.48l-0.26,-0.82l-0.76,-1.75l-0.35,-1.32l-0.59,-0.7l0.44,-1.16l0.49,-1.06l0.64,-0.48l-0.05,-0.07l-0.35,0l-0.23,0.06l-0.21,0.35l-0.22,0.27l-0.68,1.35l-0.43,0.66l-0.28,0.19l0.46,0.25l0.07,0.21l0.09,0.48l-0.12,0.59l-0.12,0.32l-0.54,-0.02l-0.48,0.47l-1.13,0.51l-1.53,0.29l-0.75,-0.04l-0.78,-0.59l0.01,-0.34l0.03,-0.3l-1.12,-1.03l-0.64,-1.03l-0.46,-0.02l-0.4,-0.28l-0.47,-0.43l0.04,-0.35l0.07,-0.24l-0.29,-0.17l-0.37,0.02l-0.43,-0.12l1.12,-1.34l0.39,-0.9l0.31,-0.13l0.41,0.14l0.56,0.36l0.47,0.16l0.17,0.17l0.18,0.32l-0.18,0.53l-0.17,0.37l0.21,-0.1l0.59,-0.57l0.44,-0.51l0.21,0.05l0.14,0.09l0.24,0.52l0.3,0.53l0.67,-0.5l0.36,-0.63l-0.3,-0.28l-0.37,-0.16l-0.94,-0.21l0.23,-0.18l0.6,0.02l0.23,-0.17l-0.24,-0.24l-0.3,-0.21l-0.81,0.72l-1.48,-0.04l-1.04,-0.42l-1.03,0.07l-0.16,-0.08l-0.2,-0.22l0.58,-0.53l0.41,-0.3l0.02,-0.17l-0.24,-0.02l-0.45,0.14l-0.2,-0.25l0.03,-0.43l-0.07,0.04l-0.18,0.23l-0.25,-0.11l-0.22,-0.19l0.11,-0.21l0.22,-0.28l-0.1,-0.04l-0.2,0.06l-0.19,0.37l0.04,0.3l0,0.43l-0.33,0.08l-0.28,-0.05l-0.2,-0.43l-0.21,-0.93l-0.57,-0.25l-0.14,-0.47l0.36,-0.61l-0.16,-0.31l-0.38,-0.1l-0.44,0.31l-0.19,-0.27l-0.04,-0.3l-0.01,-0.43l0.12,-0.04l0.1,0.09l0.88,-0.24l0.09,-0.12l-0.7,-0.36l-0.2,-0.38l0.29,-0.22l0.52,-0.02l0.73,-0.23l-0.31,-0.41l-0.06,-0.22l-0.06,-0.37l0.12,-0.63l0.86,-1.45l0.84,-1.21l0.26,-0.28l0.39,-0.15l0.36,0.12l0.37,0.26l0.07,-0.11l-0.13,-0.11l-0.16,-0.5l0.52,-0.2l0.3,-0.56l0.02,-0.16l-0.33,0.24l-0.34,0.39l-0.09,-0.39l-0.09,-0.9l0.15,-0.85l0.12,-0.38l0.29,-0.36l0.83,-0.15l0.15,0.07l0.03,-0.17l-0.5,-0.54l0.21,-0.42l0.18,-0.22l1,-0.34l0.55,0.11l0.69,0.4l0.4,0.5l-0.06,0.26l-0.1,0.15l-0.21,0.17l-0.08,0.13l0.04,0.1l0.29,-0.29l0.48,-0.36l0.27,0.16l0.21,0.28l0.24,0l0.75,-0.24l0.38,-0.26l0.47,-0.67l0.62,-0.44l0.87,-1.38l0.26,-0.57l0.3,-0.09l0.27,0.05l0.19,0.47l0.27,0.14l1.56,-0.11l0.8,-0.21l0.55,-0.45l0.57,-0.77l0.33,-0.51l0.16,-0.67l-0.2,-0.87l-0.21,-0.73l-0.28,-1.67l-0.77,-1.11l-0.55,-0.33l-0.35,0.05l0.25,-0.71l0.74,0.08l0.48,-0.14l0.39,-0.34l0.13,-0.26l0.19,-0.53l-0.07,-0.57l-0.1,-0.31l-0.27,-0.34l-0.32,-0.5l-0.22,-0.17l-0.19,0.01l-0.93,1.01l-0.56,0.02l-0.42,-0.18l-0.36,0.57l-1.01,0.5l-0.54,0.51l-1,1.25l-0.25,0.56l-0.32,0.03l-0.23,-1.09l-1.09,-1.05l-0.33,0.36l0.18,0.33l0.25,0.23l0.41,0.1l-0.17,0.32l-0.13,0.42l-0.41,-0.39l-0.73,-0.57l-0.75,-0.3l-1.96,0.03l-1.29,0.59l-0.12,-0.12l-0.12,-0.05l-0.21,0.14l-0.09,0.24l-0.14,0.15l-0.26,0.05l-0.53,-0.09l-1.02,-0.37l-2.31,-0.54l-0.6,-0.33l-0.52,-0.79l0.01,-0.54l0.23,-0.23l-0.02,-0.78l-0.45,-0.21l-0.92,-1.12l-0.34,-0.48l0.07,-0.05l0.17,0.13l0.31,0.1l0.77,-0.16l0.26,-0.73l0.57,-0.21l0.53,0.1l-0.12,-0.2l-0.13,-0.16l-1.37,-0.37l-0.19,0.12l-2.45,-0.67l-1.94,-1.16l-0.16,-0.22l-0.18,-0.5l0.26,-0.49l0.26,-0.23l0.01,0.27l0.04,0.27l1.11,-0.62l0.58,-0.82l1.1,-0.14l0.26,-0.23l0.34,-0.44l0.49,-0.75l0.69,-0.4l0.47,-0.36l0.61,-0.21l0.52,0.35l0.16,0.05l0.95,0.07l0.31,-0.15l0.13,-0.11l0.1,-0.18l-0.93,-0.64l0.09,-0.36l0.12,-0.25l1.09,-0.75l0.83,-0.25l0.45,0.02l1.29,-0.97l0.71,-0.28l1.34,-0.19l1.1,-0.05l0.3,0.35l-0.59,-0.07l-0.26,0.06l0.19,0.12l0.21,0.25l-0.06,0.32l-0.36,0.95l0.03,0.76l-0.24,0.24l-0.23,0.34l1.12,1.08l1.74,0.07l0.95,-0.19l0.55,0.32l0.45,0.07l1.24,-0.16l0.93,0.23l0.39,-0.09l0.86,-1.61l0.34,-0.25l0.37,0.28l0.48,0.23l0.31,-0.16l0.25,0.42l-0.12,-0.87l-0.17,-0.33l-1.41,-0.6l-0.94,0.3l-0.29,-0.34l0.1,-0.67l-1.01,-1.67l-0.42,-0.34l-0.5,-0.02l-0.25,-0.58l-0.21,-0.75l0.43,-0.31l0.39,-0.14l0.36,0.24l0.41,0.99l0.38,0.15l-0.11,0.98l0.47,0.9l1.06,0.83l0.85,-0.31l0.6,0.01l0.36,0.18l0.88,0.75l0.45,0.09l1.39,-0.39l0.02,-0.73l-0.12,-0.53l-0.33,-0.33l-0.94,0.06l-0.73,-0.55l-0.62,0.15l-1.15,0.84l-0.58,-0.33l-0.36,-0.45l-0.58,-0.46l-0.07,-0.87l0.49,-1l0.36,-0.48l-0.32,-0.35l-0.81,-0.25l-1.41,0.25l-0.07,-0.34l0.01,-0.37l-0.58,0.73l-0.59,-0.15l-0.8,0.08l-1.76,-0.64l-0.63,-0.79l-0.26,-0.65l-0.47,-1.78l-0.61,-1.12l-4.19,-3.86l-1.9,-0.98l-0.92,-1.09l-0.57,-0.27l-0.55,-0.11l-0.7,-0.35l0.47,-0.44l0.33,-0.15l-0.34,0.46l0.26,0.11l0.41,-0.26l0.22,-0.31l0.32,-1.34l0.34,-2.04l-0.09,-0.81l2.32,0.16l1.55,-0.14l0.51,-0.18l1.95,-0.31l0.51,-0.23l0.94,-0.7l1.1,-1.24l0.95,-1.64l0.15,-0.44l0.06,0.11l0.09,-0.07l0.1,-0.63l0.12,-1.48l0.47,-1.41l2,-3.25l0.93,-1.3l0.31,-0.59l0.32,-0.43l0.23,0.41l0.11,0.12l0.06,0.19l-0.19,0.09l-0.31,0.42l-0.43,0.28l-0.1,0.14l0.25,-0.03l0.76,-0.31l0.43,-0.37l2.13,-0.69l1.16,-1.14l0.05,-0.26l1.72,-1.44l0.24,0.06l0.27,0.18l-0.47,0.95l0.33,0.25l-0.3,1.13l0.62,0.02l0.14,0.52l0.04,-0.45l-0.01,-0.64l0.05,-0.63l0.09,-0.44l0.44,0.2l0.99,-0.47l-1.19,-0.06l-0.71,-1.03l-0.4,-0.01l1.33,-1.52l1.22,-0.93l0.28,0.02l0.13,0.17l0.03,0.28l-0.26,0.18l-0.26,0.33l0.12,0.29l0.18,0.04l0.58,-0.24l0.26,-0.3l1.25,0.03l0.37,-0.21l0.09,-0.21l1.61,-0.04l0.3,-0.15l1.01,-0.82l0.93,-1l0.43,-0.55l0.74,-1.4l0.63,-0.92l1.04,-0.92l0.25,0.11l-0.34,0.18l-0.23,0.39l0.32,0.52l2.19,1.06l0.55,0.06l0.22,0.63l-0.18,0.61l-0.56,0.68l-1.14,0.69l0.35,0.26l0.23,0.61l0.34,0.07l0.55,-0.23l0.43,-0.37l0.88,-1.23l0.28,-0.69l0.21,-0.17l0.74,0.17l0.42,0.35l0.48,0.63l-0.17,0.6l-0.19,0.34l0.62,0.47l0.69,0.1l0.65,0.38l0.92,-0.77l0.72,-0.16l0.68,0.03l0.88,-0.42l1.49,0.57l0.38,-0.15l0.6,0.1l0.63,0.35l0.22,0.37l-0.68,0.78l-0.11,0.8l0.24,0.33l0.43,0.06l0.05,0.46l0.27,0.12l1.34,-0.03l-0.1,0.22l-0.06,0.27l-0.41,0.59l2.39,0.33l0.32,-0.32l0.49,-0.13l1.05,-0.45l0.4,0.2l0.47,0.46l0.43,0.1l0.4,-0.09l0.94,-0.65l1.08,-0.03l0.44,0.21l0.47,-0.09l1.41,0.75l0.52,0.09l0.69,0.97l0.36,0.03l0.41,-0.41l0.35,0.01l0.35,0.39l0.56,0.12l0.26,0.62l0.28,0.23l2.13,0.46l1.06,-0.21l1.54,0.06l0.74,0.29l0.78,-0.04l1.27,1.06l0.68,0.17l0.13,0.24l1.92,0.26l0.67,-0.55l1.17,-0.15l1.06,-0.47l0.6,0.01l0.7,0.12l0.27,-0.06l0.19,-0.2l1.7,0.8l0.95,0.91l0.42,0.67l1.98,0.96l0.57,0.53l0.39,0.59l0.23,0.06l0.16,-0.17l0.69,0.05L624.48,706.69zM541.12,736.98l-0.13,0.05l0.01,-0.13l0.38,-0.33l0.7,-0.42l-0.02,0.09l-0.37,0.32L541.12,736.98zM523.35,757.25l0.05,0.18l0.35,-0.03l0.49,0.08l0.54,0.18l0.53,-0.06l0.67,-0.56l0.4,-0.15l0.4,-0.08l0.44,0.14l0.43,0.3l0.16,0.18l0.13,0.31l0.09,0.37l0.13,0.26l0.8,0.32l0.51,0.13l0.12,0.18l0.11,0.25l0.42,0.19l0.44,-0.07l0.25,0.07l0.75,0.01l0.93,0.27l-0.15,0.71l-0.3,0.31l-0.85,-0.1l-0.85,0.1l-0.35,0.37l-0.29,0.46l-0.04,0.45l-0.17,0.21l-0.18,0.09l-0.14,-0.25l-0.19,-0.76l-0.13,-0.21l-0.15,-0.13l-0.41,-0.24l-0.42,-0.15l-0.25,-0.02l-0.18,-0.26l-0.1,-0.38l-0.17,-0.2l-0.33,-0.28l-0.34,-0.22l-1.07,-0.48l-0.35,-0.06l-0.36,0.05l-0.38,0.22l-0.37,0.33l-0.38,0.24l-0.39,0.05l-0.37,-0.14l-0.35,-0.32l-0.18,-0.23l-0.09,-0.39l0.01,-0.39l0.05,-0.38l0.19,-0.92l0.33,-0.18L523.35,757.25zM601.48,777.29l-0.42,0.06l-0.19,-0.09l-0.03,-0.09l0.08,-0.34l-0.01,-0.15l0.21,-0.05l0.24,0.16l0.07,0.17L601.48,777.29zM519.1,779.78l0.72,0.44l0.46,-0.05l0.37,0.37l0.15,0.3l-0.55,-0.21l-0.79,0.02l-1.07,-0.9l-0.38,-0.2l0.09,-0.51l0.41,-0.26l0.21,0.68L519.1,779.78zM587.9,780.42l-0.16,0.02l0.21,-0.33l0.15,-0.65l0.2,0.09l0.04,0.12l-0.33,0.66L587.9,780.42zM602.38,779.83l0,0.18l-0.1,0.17l0.1,0.31l-0.17,0.53l-0.07,0.34l-0.09,0.21l-0.09,0.08l-0.09,-0.05l-0.02,-0.12l0.06,-0.19l-0.22,0.01l-0.07,-0.47l0.12,-0.15l0.04,-0.2l0.01,-0.13l0.14,-0.59l0.05,-0.04l0.02,0.14l0.05,0.04l0.08,-0.06l0.11,-0.26l0.05,-0.03L602.38,779.83zM606.58,779.83l0.07,0.19l0.64,-0.04l0.18,0.03l0.07,0.09l-0.09,0.13l-0.25,0.17l-0.72,0.29l-0.58,0.38l-0.08,-0.04l-0.11,-0.41l-0.11,-0.17l-0.07,-0.23l0,-0.09l0.11,-0.16l0.21,-0.23l0.15,-0.09L606.58,779.83zM610.81,780.59l-0.11,0.16l-0.29,-0.06l-0.15,-0.1l0.52,-0.43l0.09,0.09L610.81,780.59zM541.04,780.27l0.31,0.33l0.16,0.02l0.51,-0.1l0.19,0.07l0.18,0.14l0.11,0.22l0.02,0.38l-0.08,0.34l0.03,0.48l-0.02,0.21l0.27,0.27l0.09,0.37l0.04,0.4l-0.59,0.13l-0.59,0.02l-0.51,0.27l-0.1,0.2l0.08,0.29l-0.14,0.07l-0.13,-0.06l-0.25,-0.27l-0.27,-0.13l-0.94,-0.2l-1.19,-0.79l-0.51,-0.16l-0.52,-0.58l-0.47,-0.74l0.31,-0.12l0.31,-0.06l1.38,0.11l0.17,-0.53l0.18,-0.13l0.44,-0.15l0.41,-0.29l0.18,0.01l0.19,0.11l0.39,-0.18l0.21,-0.04L541.04,780.27zM602.12,784.07l-0.37,0.1l-0.09,-0.19l0.19,-0.49l0.15,-0.28l0.11,-0.06l0.42,-0.55l0.47,-0.4l0.43,-0.59l0.44,-0.84l0.08,-0.31l0.2,-0.03l0.33,0.21l0.21,0.29l-0.1,0.23l-1.1,1.19l-0.09,0.16l-0.1,0.4l-0.09,0.14l-0.14,0.06l-0.11,0.18l-0.06,0.29l-0.14,0.15l-0.2,0.01l-0.14,0.08l-0.08,0.15L602.12,784.07zM601.17,782.4l-0.17,0.2l-0.66,-0.12l0.14,-0.4l0.5,-0.25l0.55,0.4L601.17,782.4zM612.65,784.03l-0.16,0.04l0.24,-0.43l0.32,-0.48l0.3,-0.3l0.39,-0.13l-0.04,0.22l-0.51,0.4L612.65,784.03zM558.36,792.07l-0.24,0.1l-0.26,-0.05l-0.2,-0.63l0.16,-0.02l0.33,-0.41l0.72,-0.34l0.18,-0.04L558.36,792.07zM586.35,792.65l-0.1,0.04l-0.24,-0.19l-0.16,-0.21l0.11,-0.16l0.47,-0.33l0.23,-0.01l0.09,0.05l0.04,0.1l-0.02,0.15l-0.1,0.19L586.35,792.65zM586.58,793.44l0.12,0.05l0.13,-0.38l0.09,-0.01l0.39,0.32l0.24,-0.07l0.16,0.39l0.14,0.04l0.13,-0.05l0.08,0.03l-0.03,0.41l-0.29,0.42l-0.13,0.11l-0.19,-0.11l-0.07,-0.04l-0.12,-0.18l-0.09,-0.23l-0.06,0l-0.22,0.28l0.01,0.14l0.09,0.2l-0.01,0.13l-0.24,0.06l-0.23,-0.03l-0.29,0.18l-0.07,-0.11l-0.04,-0.31l-0.09,0.04l-0.13,0.38l-0.15,0.24l-0.27,0.2l-0.06,0.1l-0.2,0.02l-0.29,0.13l-0.18,-0.02l-1.07,-0.41l-0.25,-0.15l0.88,-0.95l0.46,-0.37l0.27,0.02l0.27,0.12l0.14,-0.02l0.01,-0.42l-0.25,-0.31l0.01,-0.13l0.55,-0.22l0.21,0.03l0.23,0.11l0.22,0.18L586.58,793.44zM645.47,794.69l0.84,0.14l0.62,-0.03l0.56,0.94l0.35,0.75l0.2,0.53l0.12,0.51l0.15,0.49l-0.01,0.07l-0.33,-0.33l-0.23,-0.67l-0.12,-0.26l-0.12,-0.12l-0.12,-0.25l-0.24,-0.64l-0.01,-0.18l-0.11,-0.17l-0.12,-0.07l-0.14,0.03l-0.05,0.07l0.02,0.44l0.11,0.49l0.61,1.07l0.41,0.61l0.08,0.2l0.05,0.55l-0.17,0.25l0.22,0.51l-0.01,0.1l-0.05,0.1l-0.58,0.23l-0.53,0.94l-0.58,0.55l-0.27,0.09l-0.13,-0.09l-0.12,-0.21l-0.07,-0.28l-0.02,-0.35l0.14,-0.22l0.29,-1.16l0.01,-0.38l-0.36,-0.53l-0.22,-0.44l-0.12,-0.61l-0.19,-1.61l-0.09,-0.52L645,794.78l-0.16,-0.35l-0.12,-0.38l-0.08,-0.42l0.03,-0.16l0.29,0.22l0.35,0.6L645.47,794.69zM646.69,794.27l-0.02,0.16l-0.45,-0.01l-0.46,-0.23l-0.22,-0.3l0.05,-0.13l0.43,-0.13l0.4,0.29L646.69,794.27zM641.98,794.17l0.48,0.61l0,0.14l-0.1,0.42l-0.26,0.12l0.07,0.17l0.19,0.13l0.14,-0.1l0.5,-0.59l0.15,-0.12l0.09,-0.01l0.61,0.18l0.53,0.28l0.16,0.23l0.09,0.39l-0.14,0.85l-0.44,0.15l-0.21,-0.01l-0.22,-0.12l-0.36,0.29l0.3,0.23l0.9,0.05l0.27,0.47l0.08,0.36l-0.19,0.67l-0.51,-0.18l-0.45,-0.39l-0.92,-0.55l-0.22,-0.02l-0.15,0.1l-0.04,0.33l0.01,0.72l-0.25,0.37l-0.73,-0.16l-0.28,-0.54l-0.27,-0.86l-1,-1.03l-0.27,-0.21l-0.36,-0.62l0.14,-0.49l0.04,-0.28l0.19,-0.07l0.28,-0.22l0.16,-0.48l0.25,0.39l0.34,0.37l0,-0.35l0.16,-0.28l0.33,0.01l0.16,-0.06l0.22,-0.26l0.31,-0.13L641.98,794.17zM584.98,796.8l0.02,0.34l0.14,-0.04l0.51,-0.35l0.27,-0.1l0.35,-0.02l0.28,0.16l0.06,0.12l-0.02,0.15l-0.22,0.3l0.01,0.19l0.24,0.35l0.58,0.19l0.07,0.11l0,0.13l-0.4,0.59l-0.15,0.14l-0.1,0.03l-0.73,-0.1l-0.66,-0.19l-0.27,-0.03l-0.09,0.06l-0.19,0.18l0.14,0.05l0.58,0.04l0.21,0.26l0.09,0.19l0.05,0.21l-0.12,0.09l-0.25,0.06l-0.3,0l-0.37,0.24l-0.2,0.27l-0.74,0.07l-0.56,0.36l-0.2,0.18l-0.07,0.21l-0.21,0.16l-0.48,0.15l0.29,0.14l0.05,0.12l0.01,0.16l-0.04,0.14l-0.38,0.62l-0.71,0.51l-0.18,-0.02l-0.08,-0.06l-0.06,-0.1l0,-0.1l0.92,-1.02l-0.04,-0.05l-0.25,-0.04l-0.4,-0.28l-0.28,0.18l-0.06,-0.01l0.08,-0.24l0.18,-0.29l-0.03,-0.08l-0.1,-0.07l-0.23,-0.04L580.52,801l-0.27,0.07l-0.17,0.15l-0.01,0.06l0.37,-0.02l0.1,0.08l0.1,0.14l0.06,0.17l0.02,0.19l-0.08,0.25l-0.18,0.32l-0.26,-0.06l-0.53,-0.7l-0.23,-1.03l-0.45,-0.79l-0.02,-0.19l0.13,-0.49l0.46,-0.7l0.49,-0.19l0.35,-0.29l0.34,-0.09l0.21,0.01l0.29,0.13l0.12,0.27l-0.07,0.13l0.03,0.07l0.2,0.16l0.22,0.56l0.25,0.5l0.17,0.2l0.22,0.12l-0.23,-0.38l-0.14,-0.47l-0.07,-0.94l-0.07,-0.25l0.13,-0.07l0.36,0.04l-0.01,-0.14l-0.38,-0.32l-0.24,-0.26l-0.09,-0.21l0.01,-0.18l0.21,-0.27l0.12,-0.08l0.12,-0.03l0.24,0.06l0.11,0.08l0.31,0.6l0.15,0.19h0.12l0.11,-0.1l0.1,-0.2l0.11,-0.12l0.11,-0.04l0.35,0.09l0.12,-0.03l0.06,-0.15l0,-0.27l0.09,-0.1l0.02,-0.2l-0.19,-0.29l0.22,-0.09l0.72,0.23l0.31,0.25L584.98,796.8zM583.85,796.64l-0.09,0.17l-0.09,-0.04l-0.19,-0.2l-0.38,-0.29l-0.17,-0.2l-0.01,-0.09l0.13,-0.1l0.45,0.24l0.19,0.22L583.85,796.64zM644.5,799.72l0.28,0.67l0.21,0.52l0.18,0.63l0.31,1.29l0.14,0.48l0.04,0.27l0.03,0.69l-0.05,0.15l-0.09,0.14l-0.02,0.2l0.08,0.53l0.01,0.8l-0.08,0.45l-0.09,0.07l-0.23,-0.15l-0.19,-0.24l-0.14,-0.25l-0.34,-0.8l-0.1,-0.37l-0.01,-0.27l0.05,-0.2l0.11,-0.12l0.19,-0.33l-0.03,-0.05l-0.15,0.07l-0.3,0.04l-0.26,-0.26l-0.2,-0.14l0.04,-0.46l-0.05,-0.13l-0.4,0.14l-0.15,-0.13l-0.03,-0.17l0.01,-0.26l0.08,-0.23l0.38,-0.58l-0.04,-0.11l-0.19,-0.02l-0.24,-0.2l-0.11,-0.65l-0.26,-0.37l-0.15,0.03l-0.35,1.05l-0.18,0.23l-0.5,0.15l0.1,-0.29l0.05,-0.26l-0.18,-0.79l0,-0.31l0.12,-0.23l0.35,-0.09l0.19,-0.13l0.15,-0.22l0.04,-0.21l0.27,-0.56l0.13,-0.11l0.34,0.01l0.72,0.63l0.22,0.09L644.5,799.72zM527.67,800.75l-0.34,0.29l-0.31,-0.11l-0.09,-0.21l0,-0.09l0.9,-0.24L527.67,800.75zM584.62,801.11l-0.42,0.2l-0.07,-0.01l-0.26,0.4l-0.2,0.17l-0.26,-0.31l0.07,-0.49l0.23,-0.32l1.16,0.11l0.09,0.09l0,0.08l-0.08,0.06L584.62,801.11zM649.83,801.85l0.22,0.19l0.12,-0.2l0.23,0.01l0.42,0.18l0.25,0.27l0.14,0.3l0.01,0.18l-0.04,0.41l0.03,0.42l-0.02,0.22l-0.06,0.18l-0.09,0.14l-0.1,0.02l-0.32,-0.38l-0.37,-0.68l-0.28,-0.21l-0.01,0.07l0.08,0.2l0.23,0.37l0.04,0.22l0.16,0.27l0.07,0.2l0.04,0.27l0,0.23l-0.04,0.2l-0.07,0.13l-0.1,0.06l-0.56,-0.06l-0.34,0.13l-0.39,-0.07l-0.09,-0.12l-0.06,-0.2l-0.03,-0.48l-0.1,-0.69l0.02,-0.53l-0.25,-0.48l-0.22,-0.29l-0.31,-0.26l-0.21,-0.26l0.06,-0.2l0.32,-0.15l0.53,0.04L649.83,801.85zM647.76,802.81l0.22,0.42l0.31,-0.03l0.18,0.32l0.13,0.47l-0.1,0.3l-0.14,-0.07l-0.15,0.18l-0.09,0.58l0.04,0.58l-0.05,0.58l-0.18,0.59l-0.04,0.39l-0.07,0.12l-0.08,0.04l-0.1,-0.11l-0.14,-0.08l-0.18,0.33l-0.22,0l-0.18,-0.75l0.16,-1.26l0.37,-0.26l-0.22,-0.34l-0.46,-0.4l0.04,-0.22l-0.35,-0.64l-0.02,-0.15l0.06,-0.54l0.33,-0.48l0.44,-0.09l0.3,0.21l0.17,0.18L647.76,802.81zM651.88,804.74l-0.04,0.09l-0.42,-0.01l-0.15,-0.07l-0.06,-0.26l0.04,-0.24l0.1,-0.18l0.12,-0.35l0.09,-0.59l0.62,0.67l0.19,0.3l0.1,0.36l-0.22,0.14l-0.27,0.07L651.88,804.74zM529.02,804.08l0.44,0.12l0.24,-0.08l0.22,0.06l0.04,0.14l-0.37,0.31l-0.15,-0.02l-0.44,-0.37L529.02,804.08zM580.63,804.8l-0.16,0.01l-0.25,-0.16l0.03,-0.19l0.35,-0.23l0.35,0.04l0.03,0.13l-0.02,0.14l-0.03,0.08l-0.11,0.09L580.63,804.8zM579.06,805.28l-0.23,0.14l-0.07,-0.05l-0.01,-0.12l0.05,-0.19l0.11,-0.19l0.35,-0.35l0.35,-0.24l0.18,0.02l0.06,0.15l-0.22,0.31L579.06,805.28zM653.99,807.23l-0.07,0.98l-0.13,-0.06l-0.12,0l-0.26,0.14l-0.27,-0.06l-0.13,-0.11l-0.05,-0.13l0.05,-0.29l-0.15,-0.16l-0.5,-0.06l-0.19,-0.07l-0.1,-0.31l-0.02,-0.4l0.08,-0.15l0.26,-0.11l0.2,-0.49l0.11,-0.07l0.42,-0.98l0.21,0.07l0.37,0.6l0.46,0.86L653.99,807.23zM651.77,806.41l-0.17,0.02l-0.2,-0.09l-0.48,-0.49l-0.01,-0.14l0.07,-0.16l0.27,-0.3l0.11,-0.07l0.65,0.03l0.21,0.08l0.05,0.14l-0.01,0.14l-0.07,0.14l-0.02,0.15l0.04,0.16l-0.08,0.15L651.77,806.41zM649.16,805.86l0.63,0.13l0.58,-0.01l0.2,0.25l0.13,0.26l0.08,0.24l0.02,0.23l-0.02,0.16l-0.07,0.17l0.02,0.06l1.13,0.56l0.53,0.59l0.21,0.31l0.12,0.26l0.22,0.65l0.47,0.76l0.25,0.23l0.14,0.22l-0.08,0.01l-0.33,-0.17l-0.72,-0.51l-0.06,0.02l-0.06,0.27l-0.11,0.24l-0.16,0.17l0.13,0.05l0.58,-0.11l0.48,0.49l0.19,0.09l0.18,0.35l0.01,0.14l-0.11,0.26l-0.08,0.11l0.03,0.07l0.14,0.04l0.54,-0.07l0.1,0.13l-0.08,1.01l0.08,0.37l0,0.17l-0.06,0.22l0,0.19l0.05,0.19l0.01,0.17l-0.14,0.45l-0.14,0.08l-0.23,0l-0.18,-0.13l-0.25,-0.39l-0.25,-0.6l-0.1,-0.09l-0.33,-0.09l-0.06,-0.07l-0.21,-0.01l-0.15,-0.25l0.02,-0.33l-0.13,-0.33l0.02,-0.15l-0.14,-0.06l-0.12,0.09l0.06,0.33l-0.07,0.25l-0.26,-0.11l-0.43,-0.81l-0.49,-0.65l-0.19,-0.16l0.05,-0.19l0.24,-0.1l0.2,0.01l0.04,-0.11l-0.41,-0.63l0.01,-0.18l0.15,-0.32l-0.19,-0.13l-0.51,0.1l-0.18,-0.07l-0.15,-0.26l-0.09,-0.22l-0.44,-0.04l-0.17,0.03l-0.29,-0.34l-0.13,-0.21l0.05,-0.11l0.27,-0.19l0.16,0.03l0.3,0.21l0.12,-0.01l0.3,-0.27l0.05,-0.25l0.22,-0.2l-0.04,-0.21l-0.12,-0.36l-0.27,-0.1l-0.56,0.22l-0.48,0.33l-0.19,-0.13l-0.04,-0.2l0.52,-0.56l0.23,-0.31l-0.04,-0.18l-0.17,-0.24l-0.01,-0.6L649.16,805.86zM657.75,810.88l-0.11,0.64l-0.23,0.66l-0.35,0.35l-0.25,-0.08l-0.18,-0.28l-0.17,0.02l-0.18,-0.06l-0.1,-0.23l0.09,-0.3l-0.08,-0.23l-0.09,0.21l-0.16,0.19l-0.4,0.25l-0.27,0.47l-0.13,0.31l-0.16,-0.33l-0.1,-0.79l-0.01,-0.34l0.29,-0.51l0.37,-0.48l0.08,-1.45l1.18,-0.73l0.11,0.04l0.38,0.55l0.41,0.76l0.11,0.34l0,0.6L657.75,810.88zM576.13,808.93l-0.13,0.19l-0.25,-0.01l-0.14,-0.06l-0.05,-0.16l0.39,-0.49l0.09,-0.07l0.07,0.02l0.03,0.2L576.13,808.93zM650.03,810.56l0.07,0.17l0.01,0.1l-0.48,0.39l-0.01,0.08l-0.11,0.24l-0.1,0.09l-0.18,0.26l-0.34,0.28l0.05,-0.84l-0.34,-0.49l0.34,-0.25l0.22,0.07l0.37,0.03l0.36,-0.21L650.03,810.56zM559.13,811.9l0.05,0l0.1,-0.04l0.22,-0.33l0.07,-0.01l0,0.1l-0.1,0.32l0.17,0.43l0.16,0.21l-0.02,0.07l-0.4,0.15l-0.31,-0.11l-0.16,0.04l-0.15,0.15l-0.1,-0.17l-0.07,-0.8l0.02,-0.14l0.17,-0.28l0.22,-0.13l0.09,0.04l0.08,0.11l0.02,0.12L559.13,811.9zM560.31,811.77l-0.05,0.46l-0.46,-0.29l-0.12,-0.14l0.08,-0.11l0.43,-0.03L560.31,811.77zM651.5,814.33l0.08,0.08l0.08,-0.05l0.14,-0.2l0.24,0.04l0.17,0.07l0.1,0.08l-0.06,0.3l-0.04,0.49l-0.1,0.17l-0.1,0.24l-0.34,-0.14l-0.27,-0.31l-0.4,-0.53l-0.22,-0.38l-0.02,-0.16l-0.14,-0.12l-0.27,-0.66l-0.15,-0.52l-0.24,-0.06l-0.31,-0.15l-0.12,-0.29l0.08,-0.25l0.44,-0.13l0.66,0.65l0.1,0.28l0.24,0.32l0.05,0.45l0.12,0.18L651.5,814.33zM561.83,812.98l-0.2,0.13l-0.06,0.16l-0.15,0.07l-0.13,0.13l-0.44,0.59l-0.19,0.11l0.21,-0.51l0.03,-0.16l0,-0.11l-0.06,-0.38l0.13,0.02l0.11,-0.08l0.21,-0.34l0.19,-0.03l0.2,-0.4l0.11,-0.03l0.05,0.06l-0.09,0.25l0.2,0.23l-0.05,0.22L561.83,812.98zM656.56,813.26l0.34,0.75l0.02,0.26l-0.32,0.09l-0.25,-0.04l-0.13,-0.09l-0.03,-0.12l0.08,-0.38l-0.17,-0.22l-0.19,-0.08l-0.17,0.13l-0.01,-0.38l0.13,-0.27l-0.07,-0.37l0,-0.28l0.04,-0.09l0.18,0.01l0.36,0.29L656.56,813.26zM563.02,812.85l-0.02,0.46l-0.05,0.07l-0.09,-0.12l-0.19,0.14l-0.1,-0.1l0.04,-0.16l-0.01,-0.13l0.14,-0.01l0.03,-0.23l-0.02,-0.1l0.07,-0.21l0.1,-0.05L563.02,812.85zM563.52,813.88l-0.11,0.03l-0.09,-0.06l-0.12,-0.33l-0.01,-0.14l0.24,0.1l0.09,0.24L563.52,813.88zM549.87,813.84l0.32,0.95l0.14,0.19l0.21,0.1l0.29,0.1l0.17,0.14l0.15,0.21l0.02,0.1l-0.91,-0.38l-0.57,0.56l-0.17,0.07l-1.63,0.03l-0.32,0.1l-0.21,0.18l-0.37,0.51l-0.19,0.2l-0.2,0.12l-0.42,0.13l-0.51,-0.02l-0.26,-0.06l-0.14,-0.24l-0.12,-0.48l0,-0.13l0.05,-0.23l0.45,-0.31l0.15,-0.17l0.59,-1.08l0.17,-0.15l0.18,-0.04l0.5,0.08l0.43,-0.32l0.92,-0.48l0.2,-0.06l0.66,-0.01l0.18,0.08l0.14,0.14L549.87,813.84zM553.78,814.61l-0.08,0.03l-0.23,-0.18l-0.08,-0.13l-0.06,-0.21l0.47,-0.3l0.1,0l0.09,0.17l0.02,0.13l-0.13,0.37L553.78,814.61zM552.93,817.16l-0.29,0.12l-0.31,-0.13l-0.26,-0.24l-0.03,-0.29l0.58,0.19l0.13,0.09L552.93,817.16zM542.94,818.66l-0.14,0.04l-0.04,-0.06l-0.02,-0.25l-0.11,-0.4l0.21,-0.14l0.13,-0.03l0.06,0.06l0.15,0.29l0.15,0.08l0.11,0.06l-0.2,0.09L542.94,818.66zM542.01,819.03l-0.12,0.1l-0.1,0.02l-0.08,-0.06l-0.34,0.07l-0.07,-0.04l-0.15,-0.34l-0.01,-0.17l0.06,-0.14l0.15,-0.12l0.25,-0.11l0.24,0.02l0.43,0.31l0.2,0.18l0.04,0.11l-0.15,0.11L542.01,819.03zM539.44,819.99l0.14,0.27l0.25,-0.17l0.18,-0.23l0.14,-0.3l0.09,-0.12l0.12,0.16l0.35,0.22l-0.29,0.33l-0.56,0.5l-0.19,0.33l-0.01,0.14l0.55,-0.11l0.15,0.02l0.1,0.11l-0.15,0.13l-0.3,0.12l-0.26,0.24l-0.6,0.41l-0.23,0.34l-0.27,0.13l-0.36,0.03l-0.64,0.22l-0.39,0.21l-0.1,0.11l-0.12,0.05l-0.15,-0.01l-0.16,0.09l-0.17,0.19l-0.14,0.09l-0.23,0.02l-0.12,0.07l-0.14,0l-0.37,-0.22l-0.09,-0.13l0.33,-0.26l0.24,-0.09l0.36,-0.04l0.35,-0.24l0.73,-0.32l0.23,-0.17l0.15,-0.61l0.17,-0.1l0.09,-0.24l0.4,0.01l0.19,0.27l0.07,0.04l0.03,-0.03l0.02,-0.22l0.21,-0.15l-0.12,-0.11l-0.37,-0.14l-0.28,-0.07l-0.18,0.01l-0.15,-0.08l-0.11,-0.17l-0.05,-0.17l0.01,-0.17l0.09,-0.19l0.17,-0.21l0.2,-0.12l0.43,-0.08l0.38,-0.14l0.2,-0.02l0.15,0.06L539.44,819.99zM540.79,820.98l-0.05,0.02l-0.08,-0.14l0,-0.13l0.06,-0.09l0.16,-0.21l0.11,-0.08l0.14,-0.04l0.04,0.06l-0.12,0.26l-0.15,0.17L540.79,820.98zM534.97,823.09l-1.02,0.59l-0.33,0.43l-0.25,0.42l-0.2,0.23l-0.14,0.04l-0.16,0.11l-0.34,0.29l-0.14,0.04l-1.08,0.68l-0.08,0.01l0.05,-0.18l0.33,-0.25l0.22,-0.23l0.24,-0.38l0.13,-0.14l0.04,-0.19l0.02,-0.38l0.06,-0.14l0.23,-0.29l0.17,-0.16l0.22,-0.05l0.45,0.05l0.19,-0.15l0.06,-0.11l-0.11,-0.1l-0.03,-0.18l0.03,-0.31l0.13,-0.27l0.23,-0.24l0.31,-0.18l0.4,-0.13l0.29,-0.01l0.52,0.28l0.08,0.13l-0.13,0.28l-0.07,0.26L534.97,823.09zM529.23,825.84l-0.05,0.22l-0.05,0.08l-0.51,-0.12l-0.34,0.04l-0.04,-0.13l0.03,-0.12l0.54,-0.18l0.22,0l0.15,0.09L529.23,825.84zM525.77,827.29l-0.21,0.17l-0.06,-0.06l-0.04,-0.21l0.12,-0.17l0.36,-0.36l0.25,0.07l0.08,0.1l-0.01,0.14l-0.09,0.18l-0.12,0.09l-0.14,0L525.77,827.29zM512.68,830.25l-1.78,0.22l-0.27,-0.15l0.27,-0.09l0.32,-0.05l0.67,-0.25l0.82,-0.22l0.64,-0.26l0.56,-0.17l0.16,-0.29l-0.49,-0.15l-0.1,-0.11l0.23,-0.13l0.2,-0.19l0.46,-0.23l0.41,0.29l0.09,0.19l-0.04,0.23l-0.08,0.24l-0.36,0.12l-0.05,0.13l0.2,0.35l-0.74,0.31L512.68,830.25zM520.02,828.97l-0.25,0.08l-0.27,-0.08l0.13,-0.29l0.13,-0.15l0.24,-0.19l0.29,0.08l0.23,0.24L520.02,828.97zM516.41,829.7l0.65,0.22l0.81,-0.02l0.3,0.05l0,0.06l-0.52,0.09l-0.18,-0.03l-0.45,0.12l-0.31,0.02l-0.7,-0.11l-0.54,0.08l-0.14,-0.03l-0.17,-0.1l-0.2,-0.17l-0.01,-0.11l0.18,-0.04l0.48,0.14l0.05,-0.07l0.41,-0.14L516.41,829.7zM508.22,830.43l-0.08,0.16l-0.32,-0.17l-0.11,-0.14l-0.02,-0.14l0.1,-0.23l0.26,0l0.15,0.1l0.14,0.18l0.04,0.11L508.22,830.43zM506.32,831.15l0.02,0.18l0.38,-0.02l0.12,0.09l0,0.35l-0.05,0.1l-0.06,0.02l-0.14,-0.08l-0.15,0.18l-0.71,0.44l-0.22,-0.24l-0.41,0.39l-0.06,-0.07l0.35,-0.92l0.34,-0.15l0.12,-0.11l-0.03,-0.29l0.16,-0.49l0.34,0.02l0.16,0.2l0,0.13L506.32,831.15zM504.48,831.96l-0.1,0.07l-0.17,0.06l-0.51,-0.06l-0.31,0.02l-0.34,0.04l-0.26,0.1l-0.05,-0.13l0.01,-0.11l1.11,-0.29l0.26,-0.15l0.16,-0.19l0.14,-0.36l0.12,-0.11l0.07,0.01l0.16,0.14l-0.05,0.19l-0.14,0.17l-0.04,0.15L504.48,831.96zM502.05,832.31l-0.07,0.18l-0.08,0l-0.44,-0.29l-0.06,-0.1l0.26,-0.14l0.08,-0.11l-0.03,-0.14l-0.19,-0.2l-0.36,-0.25l-0.14,-0.18l0.09,-0.11l0.17,-0.07l0.54,-0.01l0.29,0.31l0.22,0.11l0.52,0.07l-0.27,0.13l-0.15,0.13l-0.19,0.49L502.05,832.31zM508.26,831.44l-0.28,0.12l-0.37,-0.24l0.04,-0.28l0.41,0.23L508.26,831.44zM507.34,831.55l-0.21,0.31l-0.15,-0.14l-0.06,-0.43l0.12,-0.11l0.33,0.31L507.34,831.55z" }, - { + */ + { "id":"US-AL", "title":"Alabama", "d":"M871.42,622.65l0.25,1.46l0.25,1.46l0.25,1.46l0.25,1.45l0.25,1.45l0.25,1.45l0.25,1.45l0.25,1.45l0.25,1.44l0.25,1.44l0.25,1.44l0.25,1.44l0.25,1.43l0.25,1.43l0.25,1.43l0.25,1.43l0.23,0.65l0.19,1.05l1.33,3.1l0.39,1.3l-0.11,0.54l0.17,0.46l0.44,0.38l-0.08,0.44l-0.6,0.5l-0.39,0.6l-0.28,1.07l0,0.01l-0.56,1.88l-0.01,1.14l0.54,1.56l0,0l0.11,0.69l-0.35,3.04l0.24,1.95l0.57,1.27l-3.04,0.01l-3.04,0l-3.04,0h-3.04l-3.04,0h-3.04l-3.04,0h-3.04l-0.13,0.78l0.06,0.75l0.33,0.71l1.36,1.35l0.13,0.33l-0.24,1.04l0.04,0.74l-0.15,0.38l-0.33,0.34l-0.09,0.37l-0.22,0.1l-1.03,1.12l-3.61,0.37l0.2,-0.25l0.76,-0.05l1.07,-0.35l-0.22,-0.6l-0.41,-0.66l-0.38,-0.07l-0.25,-0.39l0.01,-1.22l-0.24,-0.71l-0.59,-0.73l-0.2,0.14l-0.43,1.25l-0.36,1.64l-0.18,0.53l-1.07,0.04l-0.95,-0.11l-0.47,0.03l-0.12,-2.24l-0.1,-2.04l-0.1,-2.05l-0.1,-2.05l-0.1,-2.06l-0.1,-2.06l-0.1,-2.06l-0.1,-2.07l0.23,-2.04l0.23,-2.04l0.23,-2.05l0.23,-2.05l0.23,-2.06l0.23,-2.06l0.23,-2.07l0.23,-2.07l0.23,-2.07l0.23,-2.08l0.23,-2.08l0.23,-2.09l0.23,-2.09l0.23,-2.1l0.23,-2.1l0.23,-2.11l0.06,-0.53l0.01,-0.18l0.03,-0.27l-0.83,-0.75l-0.16,-0.15l-0.12,-0.14l0.12,-0.01l1.51,0.02l1.51,0.02l1.51,0.02l1.51,0.02l1.51,0.02l1.51,0.02l1.51,0.02l1.51,0.02l1.51,0.02l1.51,0.02l1.51,0.02l1.51,0.02l1.51,0.02l1.51,0.02l1.51,0.02L871.42,622.65zM848.38,675.5l-0.83,0.23l-1.23,-0.02l-0.25,-0.08l0.49,-0.15l1.46,-0.21L848.38,675.5z" @@ -68,12 +76,14 @@ AmCharts.maps.usa2High={ "title":"Georgia", "d":"M916.15,656.05l-0.48,0.94l-1.15,0.58l-0.35,-0.02l-0.29,0.17l0.17,0.42l0.29,0.3l-0.01,0.28l-0.3,0.38l-0.6,0.11l-0.34,0.44l0.11,0.41l0.2,0.23l-0.04,0.4l-0.68,0.4l-0.16,0.39l0.34,0.11l0.26,-0.11l0.19,0.08l-0.41,0.65l-0.37,0.4l-0.35,0.71l-0.81,0.2l0.03,0.23l0.46,0.2l0.38,0.55l-0.72,1.01l-0.45,-0.08l-0.27,-0.22l-0.17,0.8l0.07,0.42l-0.17,0.87l-0.28,1.04l-0.19,0.43l0.04,0.8l0.12,0.77l-1.59,-0.1l-1.95,-0.72l-0.52,-0.14l-0.2,0.06l-0.24,0.27l-0.28,0.12l-0.24,0.5l-0.03,0.86l0.18,1.02l-0.07,0.89l-0.3,0.8l-0.48,0.36L904,674.16l-0.3,-0.19l-0.11,-0.31l-0.06,-0.64l-0.25,-0.56l-0.01,-0.36l-1.5,-0.1l-1.5,-0.1l-1.5,-0.1l-1.5,-0.1l-1.5,-0.1l-1.5,-0.1l-1.5,-0.1l-1.5,-0.1l-1.5,-0.1l-1.5,-0.1l-1.5,-0.1l-1.5,-0.1l-1.5,-0.1l-1.5,-0.1l-1.5,-0.1l-1.5,-0.1l-0.88,-0.06l-0.03,-0.42l-0.75,-1.78l-0.39,-0.86l-0.57,-1.27l-0.24,-1.95l0.36,-3.04l-0.11,-0.69l0,0l-0.54,-1.56l0.01,-1.14l0.56,-1.88l0,0l0.28,-1.06l0.39,-0.6l0.6,-0.5l0.08,-0.44l-0.44,-0.38l-0.16,-0.46l0.11,-0.54l-0.39,-1.3l-1.33,-3.09l-0.19,-1.05l-0.23,-0.65l-0.25,-1.43l-0.25,-1.43l-0.25,-1.43l-0.25,-1.43l-0.25,-1.44l-0.25,-1.44l-0.25,-1.44l-0.25,-1.44l-0.25,-1.44l-0.25,-1.45l-0.25,-1.45l-0.25,-1.45l-0.25,-1.45l-0.25,-1.46l-0.25,-1.46l-0.25,-1.46l3.06,0.04l3.06,0.04l3.06,0.04l3.06,0.04l2.85,-0.04l2.85,-0.04l2.85,-0.04l2.85,-0.04l-0.06,0.01l-0.46,0.77l-1.38,1.45l-0.37,1.11l1.78,1.24l0.01,0.01l1.06,1l0.73,0.39l0.74,0.12l0.46,0.33l0.27,0.81l0,0l2.16,3.95l0,0l2.24,2.03l0.9,1l0.45,0.97l1.91,1.58l0.65,0.85l0.03,0.65l0.23,0.46l0.42,0.27l0.4,0.58l0.39,0.88l0.76,0.77l1.14,0.65l0.83,1.49l0.53,2.31l0.54,1.34l0.82,0.56l1.12,1.97l0.36,1.17l-0.02,1.03l0.57,0.8L916.15,656.05zM911,667.67l-0.42,2.66l-0.18,-0.94l-0.02,-0.91l0.32,-0.54L911,667.67z" }, - { + /* + { "id":"US-HI", "title":"Hawaii", "d":"M676.23,732.13l-1.04,0.71l-0.6,-0.31l-1.15,-0.11l-0.44,-0.54l-1.2,-0.48l-0.49,-0.66l0.74,-1.25l1.74,-1.05l2.69,0.05l0.56,0.83l0.05,0.62l-0.35,0.69l-0.16,0.98L676.23,732.13zM666.69,733.29l-0.24,0.56l-0.41,-0.09l-0.1,-0.5l0.27,-0.69l0.67,-0.59l0.75,-0.9l0.61,0.14l-0.33,0.59l-0.04,0.64l-0.87,0.36L666.69,733.29zM694.83,738.15l0.41,0.07l0.52,-0.09l0.18,1.01l0.61,0.56l0.22,0.33l-0.66,0.35l-1.27,0.14l-0.6,-0.28l-0.62,-0.63l-0.67,0.17l-0.12,-0.5l-0.12,-0.15l-0.46,0.14l0.43,0.65l-1.16,0.05l-0.37,-0.08l-0.32,-0.74l-1.2,-1.42l0.01,-0.55l-0.41,-0.66l1.77,-0.19l1.21,-1.16l0.69,-0.12l1.31,1.87l-0.03,0.52l0.29,0.51L694.83,738.15zM701.75,741.19l2.5,0.35l0.59,-0.15l0.41,0.28l2.07,0.17l0.36,0.11l-0.42,0.65l-1.32,0.6l-1.9,-0.52l-3.18,-0.19l0.13,-0.5l0.3,-0.35l0.05,-0.62L701.75,741.19zM710.34,744.75l0.31,0.23l1.26,-0.34l0.91,-0.12l1.53,0.83l0.53,0.57l1,0.61l0.34,0.44l-0.28,0.53l-1.11,0.88l-1.51,0.2l-0.89,0.37l-1.17,-0.08l-0.35,-0.16l-0.13,-1.11l-0.37,-1.19l-0.75,0.14l-0.85,-0.4l-0.88,-1l-0.09,-0.6l0.48,-0.95l0.84,-0.12l0.63,0.52L710.34,744.75zM706.05,746.76l-0.7,0.35l-0.76,-0.16l-0.18,-0.86l-0.73,-1.09l1.29,-0.22l0.72,0.32l0.38,0.34l0.46,0.59L706.05,746.76zM721.04,768.76l-0.52,0.6l-0.65,-0.05l-2.37,-1.28l-0.29,-0.69l0.18,-3.19l-0.89,-2.6l-0.98,-1.98l0.71,-1.02l0.94,-0.79l1.05,-1.49l-0.86,-1.92l0.22,-1.16l0.5,-0.2l2.48,1.41l5,2.11l1.33,1.48l0.24,1.59l0.91,0.2l0.43,1.09l1.31,0.95l0.44,0.55l-0.55,0.88l-2.4,1.68l-3.03,0.74l-2.66,1.88L721.04,768.76z" }, - { + */ + { "id":"US-IA", "title":"Iowa", "d":"M824.1,532.18L824.67,533.05L825.66,533.83L826.22,534.56L826.36,535.24L826.96,535.97L828.03,536.74L828.65,537.42L828.82,538.01L828.79,538.92L828.56,540.15L828.17,541.04L827.62,541.58L827.22,542.34L826.95,543.32L826.11,544.21L824.7,545.04L823.12,545.6L821.39,545.9L820.36,546.61L820.04,547.72L820.18,548.65L820.8,549.39L821.15,550.18L821.24,551.01L820.81,552.39L819.85,554.31L818.78,555.55L817.62,556.11L817.1,556.94L817.23,558.04L817.13,558.66L816.65,558.88L815.82,558.23L815.67,557.77L815,557.31L814.9,557.02L814.39,556.76L813.92,555.86L811.55,555.88L809.17,555.89L806.8,555.91L804.42,555.93L802.05,555.95L799.68,555.97L797.3,555.98L794.93,556L792.55,556.02L790.18,556.04L787.8,556.05L785.43,556.07L783.05,556.09L780.68,556.11L778.3,556.13L775.95,556.14L775.38,555.22L775.07,554.37L775.27,553.96L775.3,552.58L775.19,550.21L774.96,548.87L774.62,548.57L774.58,548.15L774.84,547.63L774.76,547.27L774.34,547.08L774.22,546.63L774.37,545.9L774.27,545.46L773.91,545.3L773.77,545.05L773.83,544.71L773.63,544.5L773.19,544.4L773.01,543.58L773.09,542.03L772.93,540.94L772.51,540.29L772.29,539.69L772.29,539.12L771.85,538.23L770.96,537.01L770.39,535.4L770.13,533.4L769.5,532.27L769.21,532.21L768.98,531.16L768.72,530.69L768.67,530.33L767.89,529.42L767.84,529.07L767.94,528.63L768.45,527.77L768.91,526.36L769.02,525.41L769.39,524.69L769.4,524.3L769.33,523.78L769.13,523.32L768.51,522.99L768.44,522.84L768.38,522.32L768.63,521.99L768.71,521.62L768.64,521.16L768.27,520.37L768.11,519.56L769.47,519.51L772.53,519.51L775.59,519.51L778.66,519.51L781.72,519.51L784.78,519.51L787.84,519.51L790.9,519.5L793.96,519.5L797.02,519.5L800.09,519.5L803.15,519.5L806.21,519.5L809.27,519.5L812.33,519.5L815.39,519.5L818.5,519.49L818.57,520.3L818.75,520.88L819.13,521.35L819.71,521.7L819.8,522.39L819.42,523.4L819.29,524.65L819.41,526.14L819.7,527.48L820.15,528.67L821.19,529.54L822.8,530.1L823.75,530.94L824.03,532.09z" diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/lib/ammap/maps/js/usa2Low.js b/js/apps/system/_admin/aardvark/APP/frontend/js/lib/ammap/maps/js/usa2Low.js index 28371e3487..99dc155291 100755 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/lib/ammap/maps/js/usa2Low.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/lib/ammap/maps/js/usa2Low.js @@ -7,17 +7,19 @@ AmCharts.maps.usa2Low={ "projection":"mercator", "leftLongitude":"-124.541947", "topLatitude":"49.390806", - "rightLongitude":"-67.118615", - "bottomLatitude":"14.052495" + "rightLongitude":"-66.95", + "bottomLatitude":"25.14" } }, "g":{ "path":[ - { - "id":"US-AK", + /* + { + "id":"US-AK", "title":"Alaska", "d":"M517.54,701.07l2.66,5.08l1.63,-2.17l6.22,0.67l-0.22,2.56l5.63,1.88l3.75,-1.1l7.76,3.46l7.08,1.02l2.83,1.4l4.9,-1.75l5.58,3.23l4,1.49l0,0l-0.02,36.3l-0.02,46.52l3.63,0.22l3.58,2.04l2.57,3.2l3.27,4.72l3.58,-4.01l3.7,-2.35l1.95,3.75l2.48,2.93l3.37,3.18l2.3,4.98l3.76,7.72l6.26,4.21l0.1,4.1l-2.05,3.09l-2.02,-2.41l-3.24,-2.06l-1.04,-5.72l-4.75,-5.42l-1.98,-6.48l-3.53,-0.45l-5.85,-0.17l-4.31,-2.01l-7.61,-7.41l-3.52,-1.38l-6.44,-2.62l-5.1,0.63l-7.24,-3.4l-4.38,-3.2l-4.09,1.59l0.76,5.16l-2.03,0.47l-4.26,1.53l-3.24,2.44l-4.08,1.53l-0.53,-4.26l1.66,-7.26l3.91,-2.33l-1.01,-1.91l-4.69,4.23l-2.51,4.95l-5.3,5.18l2.69,3.48l-3.48,5.05l-3.96,2.9l-3.68,2.09l-0.91,3l-5.75,3.46l-1.16,3.1l-4.31,2.79l-2.53,-0.5l-3.44,1.81l-3.74,2.19l-3.06,2.13l-6.32,1.81l-0.58,-1.06l4.03,-2.98l3.6,-1.99l3.92,-3.56l4.57,-0.74l1.81,-2.71l5.1,-4.01l0.82,-1.36l2.72,-2.41l0.64,-5.25l1.87,-4.17l-4.24,2.15l-1.19,-1.22l-1.99,2.56l-2.4,-3.58l-0.99,2.54l-1.38,-3.54l-3.68,2.85l-2.26,-0.01l-0.32,-4.24l0.67,-2.65l-2.37,-2.6l-4.79,1.4l-3.11,-3.45l-2.52,-1.79l-0.02,-4.27l-2.84,-3.26l1.42,-4.47l3,-4.42l1.31,-4.14l2.98,-0.6l2.53,1.3l2.97,-3.95l2.67,0.71l2.81,-2.57l-0.68,-3.83l-2.06,-1.53l2.72,-3.31l-2.26,0.1l-3.91,1.87l-1.12,1.88l-2.9,-1.88l-5.21,0.96l-5.39,-2.05l-1.55,-3.48l-4.66,-5.13l5.17,-3.76l8.21,-4.47h3.03l-0.5,4.57l7.77,-0.35l-2.99,-5.7l-4.53,-3.57l-2.62,-4.78l-3.53,-4.16l-5.06,-3.13l2.06,-5.29l6.53,-0.33l4.65,-4.71l0.88,-5.14l3.76,-5.14l3.59,-1.25l6.98,-4.93l3.38,0.75l5.67,-6.05L517.54,701.07zM456.2,772.37l2.27,1.58l2.29,-0.85l2.98,2.18l3.66,1.1l-0.3,0.89l-2.79,1.72l-2.8,-1.77l-1.4,-1.48l-3.24,0.48l-0.88,-0.72L456.2,772.37zM478.85,802.58l-2.26,1.14l-2.41,-1.37l-2.23,-2l3.63,-1.27l2.92,0.67L478.85,802.58zM525.13,822.25l-3.68,2.57l-1.88,-1.73l-0.57,-3.18l3.34,-2.44l1.97,-1.05l2.44,0.47l1.56,2.14L525.13,822.25z" - }, + }, + */ { "id":"US-AL", "title":"Alabama", @@ -68,12 +70,14 @@ AmCharts.maps.usa2Low={ "title":"Georgia", "d":"M836.67,622.58L835.64,623.53L834.13,625.7L836.67,627.59L838.31,628.29L840.07,631.88L841.19,633.89L844.47,636.57L845.12,637.98L847.36,639.81L848.46,642.49L851.47,644.75L852.14,647.3L852.7,648.54L852.38,649.36L854.14,650.58L855.06,652.66L855.05,654.77L855.91,655.18L857.53,655.75L853.43,663.83L851.63,670.08L849.64,669.88L847.77,669.08L846.63,669.45L846.61,673.24L845.39,674.21L844.69,672.31L829.4,670.68L819.92,670.17L818.48,667.23L818.02,665.94L817.42,664.54L817.68,662.74L817.91,660.79L817.4,658.71L817.93,655.2L819.49,653.25L818.66,651.26L817.31,647.78L815.08,636.62L812.63,622.5L819.91,622.61L824.94,622.49z" }, - { + /* + { "id":"US-HI", "title":"Hawaii", "d":"M623.7,739.77l-1.43,1.28l-1.81,-0.44l-2.21,-1.74l0.77,-1.29l1.8,-1.09l2.78,0.05l0.58,0.86L623.7,739.77zM643.57,746.53l1.05,1.96l-2,0.51l-1.26,-0.94l-0.69,0.18l-0.28,0.14l-1.58,-0.03l-1.99,-3.49l1.84,-0.2l1.96,-1.32l1.63,3.01L643.57,746.53zM655.91,750.48l-1.81,1.29l-5.27,-0.73l0.49,-1.53L655.91,750.48zM657.46,752.06l1.52,1.56l2.24,-0.48l3.17,2.07l0.06,1.01l-1.15,0.91l-3.69,0.51l-0.87,-2.55l-1.66,-0.27l-1.01,-1.66l0.5,-0.98L657.46,752.06zM670.32,777l-1.11,1.87l-3.13,-1.37l-0.12,-4.02l-1.93,-4.74l2.79,-3.42l-0.89,-1.99l0.23,-1.2l0.52,-0.21l7.75,3.65l1.38,1.54l0.25,1.65l0.94,0.21l0.45,1.13l1.82,1.55l-3.05,2.65l-3.14,0.76L670.32,777z" }, - { + */ + { "id":"US-IA", "title":"Iowa", "d":"M759.79,519L759.93,519.71L761.16,521.76L760.31,522.74L760.34,525.44L760.73,526.59L761.33,528.62L764.41,529.85L765.33,531.8L765.88,532.77L766.99,533.42L767.44,534.79L768.93,535.81L769.9,536.9L769.4,540.3L767.65,543.15L767.02,544.05L764.86,544.78L761.63,545.39L760.78,547.55L761.95,548.52L762.35,550.45L761.12,552.6L760.49,554.49L758.08,556.33L757.89,558.58L756.59,557.55L754.79,555.55L744.48,555.82L733.63,555.91L725.18,555.93L716.71,555.92L716.09,553.68L716.35,551.46L716.15,549.31L715.18,545.71L714.55,544.21L713.88,543.8L713.8,540.89L713.21,538.8L711.5,536.42L711.52,535.37L710.92,533.27L710.5,532.01L710.51,530.84L708.98,529.42L709.74,527.32L710.23,525.26L710.46,523.87L709.25,522.15L709.26,519L710.52,518.99L720.83,519.01L733.64,518.84L747.42,518.76z" diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/lib/ammap/themes/light.js b/js/apps/system/_admin/aardvark/APP/frontend/js/lib/ammap/themes/light.js index 6960970b61..739c79e038 100755 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/lib/ammap/themes/light.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/lib/ammap/themes/light.js @@ -58,6 +58,7 @@ AmCharts.themes.light = { AmGraph: { lineAlpha: 0.9 }, + GaugeArrow: { color: "#000000", alpha: 0.8, @@ -87,15 +88,16 @@ AmCharts.themes.light = { // ammap AreasSettings: { - alpha: 0.8, - color: "#67b7dc", - colorSolid: "#003767", + alpha: 0.9, + color: "#8aa051", + colorSolid: "#ff0000", + // colorSolid: "#003767", unlistedAreasAlpha: 0.4, - unlistedAreasColor: "#000000", - outlineColor: "#FFFFFF", + unlistedAreasColor: "#ff0000", + outlineColor: "#FFFFFF", outlineAlpha: 0.5, outlineThickness: 0.5, - rollOverColor: "#3c5bdc", + rollOverColor: "#8aa051", rollOverOutlineColor: "#FFFFFF", selectedOutlineColor: "#FFFFFF", selectedColor: "#f15135", @@ -116,17 +118,17 @@ AmCharts.themes.light = { }, ZoomControl: { - buttonRollOverColor: "#3c5bdc", - buttonFillColor: "#3994e2", + buttonRollOverColor: "#6A873E", + buttonFillColor: "#88A049", buttonBorderColor: "#3994e2", - buttonFillAlpha: 0.8, + buttonFillAlpha: 0.9, gridBackgroundColor: "#FFFFFF", buttonBorderAlpha:0, buttonCornerRadius:2, gridColor:"#FFFFFF", gridBackgroundColor:"#000000", buttonIconAlpha:0.6, - gridAlpha: 0.6, + gridAlpha: 0.8, buttonSize:20 }, @@ -177,7 +179,6 @@ AmCharts.themes.light = { }, DataSetSelector: { - color: "#000000", selectedBackgroundColor: "#b9cdf5", rollOverBackgroundColor: "#a8b0e4" diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js index 92eb96a851..91865eacb9 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/demoView.js @@ -8,6 +8,13 @@ window.DemoView = Backbone.View.extend({ //MAP SPECIFIC VARIABLES + // svg path for target icon + MAPtarget: ( + "M9,0C4.029,0,0,4.029,0,9s4.029,9,9,9s9-4.029,9-9S13.971,0,9,0z M9," + + "15.93 c-3.83,0-6.93-3.1-6.93-6.93S5.17,2.07,9,2.07s6.93,3.1,6.93," + + "6.93S12.83,15.93,9,15.93 M12.5,9c0,1.933-1.567,3.5-3.5,3.5S5.5," + + "10.933,5.5,9S7.067,5.5,9,5.5 S12.5,7.067,12.5,9z" + ), MAPicon: ( "M23.963,20.834L17.5,9.64c-0.825-1.429-2.175-1.429-3,0L8.037,20.834c-0.825," + "1.429-0.15,2.598,1.5,2.598h12.926C24.113,23.432,24.788,22.263,23.963,20.834z" @@ -26,9 +33,9 @@ //ICON FROM http://raphaeljs.com/icons/#plane MAPcolor: "black", - keyToLongLat: {}, + keyToLongLat: {}, - //QUERIES SECTION + //QUERIES SECTION queries: [ { name: "i am just a dummy name", @@ -60,11 +67,7 @@ this.airportCollection.each(function(model) { airport = model.toJSON(); - airports.push({ - _key: airport._key, - Latitude: airport.Latitude, - Longitude: airport.Longitude - }); + airports.push(airport); }); var preparedData = this.prepareData(airports); this.renderMap(preparedData); @@ -102,13 +105,12 @@ id: airport._key, latitude: airport.Latitude, longitude: airport.Longitude, - type: "circle", // CIRCLE INSTEAD OF ICON - //svgPath: self.MAPplaneicon, //ICON if wanted + svgPath: self.MAPtarget, color: self.MAPcolor, - scale: 0.2, //ICON SCALE - //TODO: LABEL TEMP. DISABLED BECAUSE OF READABILITY - label: airport._key, - labelShiftY: 2 + scale: 0.5, + selectedScale: 2.5, + title: airport.City + "
" + airport.Name + "
" + airport._key, + rollOverColor: "#ff8f35", }); self.keyToLongLat[airport._key] = { lon: airport.Longitude, @@ -146,19 +148,56 @@ AmCharts.theme = AmCharts.themes.light; self.map = AmCharts.makeChart("demo-mapdiv", { type: "map", - theme: "light", + dragMap: true, + creditsPosition: "bottom-left", pathToImages: "img/ammap/", dataProvider: { - map: "worldLow", + map: "usa2High", lines: self.lines, images: imageData, getAreasFromMap: true, - zoomLevel: 2.25, - zoomLatitude: 48.22, - zoomLongitude: -100.00 + //zoomLevel: 2.25, + //zoomLatitude: 48.22, + //zoomLongitude: -100.00 }, - areaSettings: { - autoZoom: true, + balloon: { + /* + maxWidth, + pointerWidth, + pointerOrientation, + follow, + show, + bulletSize, + shadowColor, + animationDuration, + fadeOutDuration, + fixedPosition, + offsetY, + offsetX, + textAlign, + chart, + "l", "t", "r", "b", + "balloonColor", + "pShowBullet", + "pointToX", "pointToY", "interval", "text", "deltaSignY", "deltaSignX", "previousX", "previousY", "set", "textDiv", "bg", "bottom", "yPos", "prevX", "prevY", "prevTX", "prevTY", "destroyTO", "fadeAnim1", "fadeAnim2"] + */ + adjustBorderColor: true, + balloonColor: "#ffffff", + color: "#000000", + cornerRadius: 5, + fillColor: "#ffffff", + fillAlpha: 0.8, + borderThickness: 2, + borderColor: "#88A049", + borderAlpha: 0.8, + shadowAlpha: 0, + fontSize: 10, + verticalPadding: 2, + horizontalPadding: 4, + }, + areasSettings: { + autoZoom: false, + balloonText: "", selectedColor: self.MAPcolor }, linesSettings: { @@ -174,7 +213,8 @@ this.map.validateData(); }, - renderDummy: function() { +/* + renderDummy: function() { // svg path for target icon var targetSVG = ( @@ -200,7 +240,7 @@ var map = AmCharts.makeChart( "demo-mapdiv", { type: "map", "theme": "light", - pathToImages: "http://www.amcharts.com/lib/3/images/", + // pathToImages: "http://www.amcharts.com/lib/3/images/", dataProvider: { map: "worldLow", @@ -458,7 +498,7 @@ } } ); } - +*/ }); }()); diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/style.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/style.scss index f99afcaebb..2e808b9a71 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/scss/style.scss +++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/style.scss @@ -85,3 +85,6 @@ // Plugin @import 'uploadfile'; + +// Demo +@import 'demo';