Skip to content

Commit

Permalink
Initial conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
@samuelli
samuelli committed Apr 28, 2017
1 parent 9ca485d commit 361d389
Show file tree
Hide file tree
Showing 14 changed files with 45 additions and 41 deletions.
12 changes: 6 additions & 6 deletions bower.json
View file
Expand Up @@ -28,13 +28,13 @@
"maps"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.7.1",
"google-apis": "GoogleWebComponents/google-apis#^1.1.7",
"iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^1.0.5",
"iron-selector": "PolymerElements/iron-selector#^1.5.2"
"polymer": "Polymer/polymer#^2.0.0-rc.7",
"google-apis": "GoogleWebComponents/google-apis#2.0-preview",
"iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#2.0-preview",
"iron-selector": "PolymerElements/iron-selector#2.0-preview"
},
"devDependencies": {
"web-component-tester": "*",
"iron-component-page": "PolymerElements/iron-component-page#^1.1.7"
"web-component-tester": "^6.0.0-prerelease.6",
"iron-component-page": "PolymerElements/iron-component-page#2.0-preview"
}
}
36 changes: 19 additions & 17 deletions demo/index.html
View file
Expand Up @@ -4,7 +4,7 @@
<head>
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<title>Google Map demo</title>
<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<link rel="import" href="../google-map.html">
<link rel="import" href="../google-map-marker.html">
<link rel="import" href="../google-map-poly.html">
Expand All @@ -23,23 +23,25 @@
</head>
<body class="fullbleed">

<template is="dom-bind">
<google-map latitude="37.779" longitude="-122.3892" min-zoom="9" max-zoom="11"
language="en" api-key="[[apiKey]]">
<google-map-marker latitude="37.779" longitude="-122.3892" label="GG"
title="Go Giants!" draggable="true" drag-events>
<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/4/49/San_Francisco_Giants_Cap_Insignia.svg/200px-San_Francisco_Giants_Cap_Insignia.svg.png" />
</google-map-marker>
<google-map-poly closed fill-color="red" fill-opacity=".25" stroke-weight="1">
<google-map-point latitude="37.779" longitude="-122.3892"></google-map-point>
<google-map-point latitude="37.804" longitude="-122.2711"></google-map-point>
<google-map-point latitude="37.386" longitude="-122.0837"></google-map-point>
</google-map-poly>
</google-map>
<dom-bind>
<template is="dom-bind">
<google-map latitude="37.779" longitude="-122.3892" min-zoom="9" max-zoom="11"
language="en" api-key="[[apiKey]]">
<google-map-marker slot="markers" latitude="37.779" longitude="-122.3892" label="GG"
title="Go Giants!" draggable="true" drag-events>
<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/4/49/San_Francisco_Giants_Cap_Insignia.svg/200px-San_Francisco_Giants_Cap_Insignia.svg.png" />
</google-map-marker>
<google-map-poly closed fill-color="red" fill-opacity=".25" stroke-weight="1">
<google-map-point latitude="37.779" longitude="-122.3892"></google-map-point>
<google-map-point latitude="37.804" longitude="-122.2711"></google-map-point>
<google-map-point latitude="37.386" longitude="-122.0837"></google-map-point>
</google-map-poly>
</google-map>

<google-map-directions start-address="Oakland" end-address="Mountain View"
language="en" api-key="[[apiKey]]"></google-map-directions>
</template>
<google-map-directions start-address="Oakland" end-address="Mountain View"
language="en" api-key="[[apiKey]]"></google-map-directions>
</template>
</dom-bind>

<button id="controlsToggle" onclick="toggleControls()">Toggle controls</button>

Expand Down
2 changes: 1 addition & 1 deletion demo/kml.html
View file
Expand Up @@ -4,7 +4,7 @@
<head>
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<title>Google Map Poly demo</title>
<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<link rel="import" href="../google-map.html">
<link rel="import" href="../google-map-poly.html">
<style>
Expand Down
2 changes: 1 addition & 1 deletion demo/polys.html
View file
Expand Up @@ -4,7 +4,7 @@
<head>
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<title>Google Map Poly demo</title>
<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<link rel="import" href="../google-map.html">
<link rel="import" href="../google-map-poly.html">
<style>
Expand Down
2 changes: 1 addition & 1 deletion google-map-marker.html
View file
Expand Up @@ -40,7 +40,7 @@
}
</style>

<content></content>
<slot></slot>
</template>
<script>
(function() {
Expand Down
4 changes: 3 additions & 1 deletion google-map-poly.html
View file
Expand Up @@ -37,7 +37,7 @@
}
</style>

<content id="points" select="google-map-point"></content>
<slot id="points"></slot>
</template>
<script>
(function() {
Expand Down Expand Up @@ -487,6 +487,8 @@
this._building = true;
this.path.clear();
for (var i = 0, point; point = this._points[i]; ++i) {
if (!point.tagName != 'google-map-point')
console.error('Ignoring', point);
this.path.push(point.getPosition());
}
this._building = false;
Expand Down
4 changes: 2 additions & 2 deletions google-map.html
View file
Expand Up @@ -97,10 +97,10 @@
selected-attribute="open"
activate-event="google-map-marker-open"
on-google-map-marker-close="_deselectMarker">
<content id="markers" select="google-map-marker"></content>
<slot id="markers" name="markers"></slot>
</iron-selector>

<content id="objects" select="*"></content>
<slot id="objects" name="objects"></slot>
</template>
<script>
Polymer({
Expand Down
2 changes: 1 addition & 1 deletion test/google-map-basic.html
View file
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<script src="../../webcomponentsjs/webcomponents.js"></script>
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<script src="../../web-component-tester/browser.js"></script>
<link rel="import" href="../google-map.html">
</head>
Expand Down
2 changes: 1 addition & 1 deletion test/google-map-update-pos.html
View file
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<script src="../../webcomponentsjs/webcomponents.js"></script>
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<script src="../../web-component-tester/browser.js"></script>
<link rel="import" href="../google-map.html">
</head>
Expand Down
8 changes: 4 additions & 4 deletions test/marker-basic.html
View file
Expand Up @@ -4,16 +4,16 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<script src="../../webcomponentsjs/webcomponents.js"></script>
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<script src="../../web-component-tester/browser.js"></script>
<link rel="import" href="../google-map.html">
</head>
<body>

<google-map id="map1" latitude="37.77493" longitude="-122.41942">
<google-map-marker latitude="37.779" longitude="-122.3892"></google-map-marker>
<google-map-marker id="marker2" latitude="37.777" longitude="-122.38911" drag-events></google-map-marker>
<google-map-marker id="labeled-marker" label="GG" latitude="37.777" longitude="-122.38911" drag-events></google-map-marker>
<google-map-marker slot="markers" latitude="37.779" longitude="-122.3892"></google-map-marker>
<google-map-marker slot="markers" id="marker2" latitude="37.777" longitude="-122.38911" drag-events></google-map-marker>
<google-map-marker slot="markers" id="labeled-marker" label="GG" latitude="37.777" longitude="-122.38911" drag-events></google-map-marker>
</google-map>

<script>
Expand Down
6 changes: 3 additions & 3 deletions test/markers-add-remove.html
View file
Expand Up @@ -4,15 +4,15 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<script src="../../webcomponentsjs/webcomponents.js"></script>
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<script src="../../web-component-tester/browser.js"></script>
<link rel="import" href="../google-map.html">
</head>
<body>

<google-map id="map1" latitude="37.77493" longitude="-122.41942">
<google-map-marker latitude="37.779" longitude="-122.3892"></google-map-marker>
<google-map-marker latitude="37.777" longitude="-122.38911"></google-map-marker>
<google-map-marker slot="markers" latitude="37.779" longitude="-122.3892"></google-map-marker>
<google-map-marker slot="markers" latitude="37.777" longitude="-122.38911"></google-map-marker>
</google-map>

<script>
Expand Down
2 changes: 1 addition & 1 deletion test/origin-tests.html
View file
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<script src="../../webcomponentsjs/webcomponents.js"></script>
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<script src="../../web-component-tester/browser.js"></script>
<link rel="import" href="../google-map.html">
</head>
Expand Down
2 changes: 1 addition & 1 deletion test/poly-basic.html
View file
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<script src="../../webcomponentsjs/webcomponents.js"></script>
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<script src="../../web-component-tester/browser.js"></script>
<link rel="import" href="../google-map.html">
<link rel="import" href="../google-map-poly.html">
Expand Down
2 changes: 1 addition & 1 deletion test/poly-custom-properties.html
View file
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<script src="../../webcomponentsjs/webcomponents.js"></script>
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<script src="../../web-component-tester/browser.js"></script>
<link rel="import" href="../google-map.html">
<link rel="import" href="../google-map-poly.html">
Expand Down

0 comments on commit 361d389

Please sign in to comment.