Skip to content

Commit 5104d40

Browse files
frankpaganfrankpagan
committed
fixed bugs
1 parent 1ebebce commit 5104d40

File tree

12 files changed

+81
-117
lines changed

12 files changed

+81
-117
lines changed

‎demo/autocomplete.html‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -162,36 +162,23 @@
162162
<div data-location_request="true"></div>
163163
<button onclick="clearAll();">Clear</button>
164164
</div>
165-
<!-- <script type="text/javascript" src="../src/map.js"></script>
166-
<script type="text/javascript" src="../src/animate.js"></script>-->
165+
<!--<script type="text/javascript" src="../src/map.js"></script>-->
166+
<!--<script type="text/javascript" src="../src/animate.js"></script>-->
167167
<!--<script type="text/javascript" src="../src/autocomplete.js"></script>-->
168-
<!-- <script type="text/javascript" src="../src/direction.js"></script>
169-
<script type="text/javascript" src="../src/location.js"></script>
170-
<script type="text/javascript" src="../src/search.js"></script>
171-
-->
172-
<!--<script type="module" src="../src/index.js"></script>-->
173-
<!-- <script type="module">
168+
<!--<script type="text/javascript" src="../src/direction.js"></script>-->
169+
<!--<script type="text/javascript" src="../src/location.js"></script>-->
170+
<!--<script type="text/javascript" src="../src/search.js"></script>-->
171+
<!--<script type="module" src="../src/index.js"></script>-->
172+
<script type="module">
174173
import {initMapSettings} from '../src/index.js';
175174
initMapSettings()
176175

177176
</script>
178-
-->
179-
<!--<script type="text/javascript" src="../dist/CoCreate-google-maps.js"></script>-->
180-
<script>
181-
182-
var config = {
183-
apiKey: 'c2b08663-06e3-440c-ef6f-13978b42883a',
184-
organization_Id: '5de0387b12e200ea63204d6c'
185-
}
186-
</script>
187-
<!--<script type="text/javascript" src="https://cdn.cocreate.app/latest/CoCreate.min.js"></script>-->
188-
177+
<script type="text/javascript" src="../dist/CoCreate-google-maps.js"></script>
189178

190179
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDCxZ_RRXPQ2Uqufgo39daiXZeQZQpIAiM&libraries=places&callback=initMapSettings"></script>
191180

192-
193-
194-
181+
195182

196183
<!--<script async-->
197184
<!-- src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAQsud7vA9plHy7FGIicfQ5IiwtJFIreVg=JP&language=ja&callback=initMapSettings">-->

‎demo/current-location.html‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,13 @@
9292
<input type="text" >
9393
<div id="map" class="google_map" data-map_id="0" style="width: 100%; height: 300px;"></div>
9494

95-
<script>
96-
var config = {
97-
apiKey: 'c2b08663-06e3-440c-ef6f-13978b42883a',
98-
organization_Id: '5de0387b12e200ea63204d6c'
99-
}
100-
//5ee2eae63e956152355a3446
101-
</script>
102-
103-
<!--<script src="https://cdn.cocreate.app/latest/CoCreate.min.js" ></script>-->
104-
105-
<script type="text/javascript" src="../dist/CoCreateMap.min.js"></script>
106-
107-
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAQsud7vA9plHy7FGIicfQ5IiwtJFIreVg&libraries=places&callback=initMapSettings"></script>
108-
<script async
109-
src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAQsud7vA9plHy7FGIicfQ5IiwtJFIreVg=JP&language=ja&callback=initMap">
110-
</script>
95+
<script type="module">
96+
import {initMapSettings} from '../src/index.js';
97+
initMapSettings()
98+
99+
</script>
100+
<script type="text/javascript" src="../dist/CoCreate-google-maps.js"></script>
101+
102+
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDCxZ_RRXPQ2Uqufgo39daiXZeQZQpIAiM&libraries=places&callback=initMapSettings"></script>
111103
</body>
112104
</html>

‎demo/direction.html‎

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -139,45 +139,14 @@
139139
<label>OptimizeWaypoint</label>
140140
</div>
141141

142-
<script type="text/javascript" src="../dist/CoCreate-maps.min.js"></script>
143-
<!--<script type="text/javascript" src="CoCreateMap_Autocomplete.js"></script>-->
144-
<!--<script type="text/javascript" src="CoCreateMap_Direction.js"></script>-->
145-
<!--<script type="text/javascript" src="CoCreateMap_Search.js"></script>-->
146-
<!--<script type="text/javascript" src="index.js"></script>-->
147-
<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAQsud7vA9plHy7FGIicfQ5IiwtJFIreVg&libraries=places&callback=initMapSettings" async defer></script>
148-
<script type="text/javascript">
149-
// function initMapSettings() {
150-
// // var coCreateMapAutocomplete = new CoCreateMapAutocomplete();
151-
// // var coCreateMapDirection = new CoCreateMapDirection();
152-
// initSortableSettings(CoCreateMapAutocomplete);
153-
// }
154-
// function initSortableSettings(coCreateMapAutocomplete) {
155-
// var observer = new MutationObserver(function(mutations){
156-
// mutations.forEach(function(mutation){
157-
// if (mutation.type == "childList" && mutation.target.classList.contains("Sortable") && mutation.target.classList.contains("waypoints") && mutation.addedNodes.length == 1) {
158-
// var addedNode = mutation.addedNodes.item(0);
159-
// var place_ids = addedNode.querySelectorAll("[data-place_id]");
160-
// for (var place_id of place_ids) {
161-
// place_id.setAttribute("data-place_id", addedNode.getAttribute("prefix"));
162-
// }
163-
// console.log(coCreateMapAutocomplete);
164-
// coCreateMapAutocomplete.init();
165-
// }
166-
// });
167-
// });
168-
// var config = { attribute:false, childList: true, characterData: false, subtree: true };
169-
170-
// observer.observe(document.body, config);
171-
// }
142+
<script type="module">
143+
import {initMapSettings} from '../src/index.js';
144+
initMapSettings()
145+
172146
</script>
173-
<script>
174-
var config = {
175-
apiKey: 'c2b08663-06e3-440c-ef6f-13978b42883a',
176-
organization_Id: '5de0387b12e200ea63204d6c'
177-
}
178-
</script>
179-
<!--<script src="https://cdn.cocreate.app/latest/CoCreate.min.js" ></script>-->
180-
<!--<script src="https://server.cocreate.app/js/CoCreate-sort.js"></script>-->
147+
<script type="text/javascript" src="../dist/CoCreate-google-maps.js"></script>
148+
149+
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDCxZ_RRXPQ2Uqufgo39daiXZeQZQpIAiM&libraries=places&callback=initMapSettings"></script>
181150

182151
</body>
183152
</html>

‎demo/fleet-tracking.html‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,15 @@
9292
<input type="text" >
9393
<div id="map" class="google_map" data-map_id="0" style="width: 100%; height: 300px;"></div>
9494

95-
<script>
96-
var config = {
97-
apiKey: 'c2b08663-06e3-440c-ef6f-13978b42883a',
98-
organization_Id: '5de0387b12e200ea63204d6c'
99-
}
100-
//5ee2eae63e956152355a3446
101-
</script>
102-
103-
<!--<script src="https://cdn.cocreate.app/latest/CoCreate.min.js" ></script>-->
104-
105-
<script type="text/javascript" src="../dist/CoCreateMap.min.js"></script>
10695

107-
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAQsud7vA9plHy7FGIicfQ5IiwtJFIreVg&libraries=places&callback=initMapSettings"></script>
96+
<script type="module">
97+
import {initMapSettings} from '../src/index.js';
98+
initMapSettings()
99+
100+
</script>
101+
<script type="text/javascript" src="../dist/CoCreate-google-maps.js"></script>
102+
103+
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDCxZ_RRXPQ2Uqufgo39daiXZeQZQpIAiM&libraries=places&callback=initMapSettings"></script>
108104

109105
</body>
110106
</html>

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
"webpack-log": "^3.0.1"
6161
},
6262
"dependencies": {
63-
"@cocreate/docs": "^1.2.47"
63+
"@cocreate/docs": "^1.2.47",
64+
"@googlemaps/js-api-loader": "^1.12.8"
6465
}
6566
}

‎src/animate.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// import CoCreateMap from './map'
1+
import {CoCreateMap} from './map.js';
22

33
/* global CoCreateMap google */
44
var CoCreateMapAnimate = function() {
@@ -211,3 +211,4 @@ CoCreateMapAnimate.prototype.constructor = CoCreateMapAnimate;
211211
// functions for prototype
212212

213213
// declaration
214+
export {CoCreateMapAnimate};

‎src/autocomplete.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// import CoCreateMap from './map'
1+
import {CoCreateMap, onlyUnique, stripHtml} from './map.js';
22

33
/* global CoCreateMap onlyUnique, google, stripHtml */
44
var CoCreateMapAutocomplete = function() {
@@ -135,7 +135,4 @@ var CoCreateMapAutocomplete = function() {
135135
CoCreateMapAutocomplete.prototype = Object.create(CoCreateMap.prototype);
136136
CoCreateMapAutocomplete.prototype.constructor = CoCreateMapAutocomplete;
137137

138-
/*export default CoCreateMapAutocomplete;*/
139-
// functions for prototype
140-
141-
// declaration
138+
export {CoCreateMapAutocomplete};

‎src/direction.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// import CoCreateMap from './map'
1+
import {CoCreateMap} from './map.js';
22

33
var CoCreateMapDirection = function() {
44
// variables
@@ -195,6 +195,7 @@ var CoCreateMapDirection = function() {
195195
CoCreateMapDirection.prototype = Object.create(CoCreateMap.prototype);
196196
CoCreateMapDirection.prototype.constructor = CoCreateMapDirection;
197197

198+
export {CoCreateMapDirection};
198199
// functions for prototype
199200

200201

‎src/index.js‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
1-
import CoCreateMapAutocomplete from './autocomplete'
2-
import CoCreateMapDirection from './direction'
3-
import CoCreateMapSearch from './search'
4-
import CoCreateMapGetLocation from './location'
1+
import './map.js';
2+
import {CoCreateMapAutocomplete} from './autocomplete.js';
3+
import {CoCreateMapDirection} from './direction.js';
4+
import {CoCreateMapSearch} from './search.js';
5+
import {CoCreateMapGetLocation} from './location.js';
56
/*const CoCreateMapAutocomplete = require('./autocomplete');*/
67

7-
// const CoCreateMaps = {
8-
// ...CoCreateMapAutocomplete,
9-
// ...coCreateMapDirection,
10-
// ...coCreateMapGetserach,
11-
// ...coCreateMapGetLocation
12-
// }
8+
// const loader = new Loader({
9+
// apiKey: "AIzaSyAQsud7vA9plHy7FGIicfQ5IiwtJFIreVg",
10+
// version: "weekly",
11+
// });
1312

13+
// loader.load().then(() => {
14+
// map = new google.maps.Map(document.getElementById("map"), {
15+
// center: { lat: -34.397, lng: 150.644 },
16+
// zoom: 8,
17+
// });
18+
// });
1419

1520
function initMapSettings() {
16-
17-
console.log(" ...... ")
1821
var coCreateMapAutocomplete = new CoCreateMapAutocomplete();
1922
var coCreateMapDirection = new CoCreateMapDirection();
2023
var coCreateMapSearch = new CoCreateMapSearch();
2124
var coCreateMapGetLocation = new CoCreateMapGetLocation();
2225
initSortableSettings(coCreateMapGetLocation);
23-
24-
2526
}
27+
2628
function initSortableSettings(coCreateMapAutocomplete) {
2729
var observer = new MutationObserver(function(mutations){
2830
mutations.forEach(function(mutation){
@@ -42,4 +44,6 @@ function initSortableSettings(coCreateMapAutocomplete) {
4244
observer.observe(document.body, config);
4345
}
4446

45-
export {CoCreateMaps,initMapSettings,initSortableSettings}
47+
window.initMapSettings = initMapSettings()
48+
49+
export {initMapSettings, initSortableSettings}

‎src/location.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// import CoCreateMap from './map'
1+
import {CoCreateMap} from './map.js';
2+
import {CoCreateMapAnimate} from './animate.js';
23

34
/*Class Custom*/
45

@@ -113,3 +114,5 @@ var CoCreateMapGetLocation = function() {
113114
CoCreateMapGetLocation.prototype = Object.create(CoCreateMapAnimate.prototype);
114115
CoCreateMapGetLocation.prototype.constructor = CoCreateMapGetLocation;
115116
// var CoCreateMapGetLocation = new CoCreateMapGetLocation();
117+
118+
export {CoCreateMapGetLocation}

0 commit comments

Comments
 (0)