Home Explore Help
Register Sign In
zengminguo
/
map-monitor
1
0
Fork 0

3 Commits 857273aa07 ... 9df5e29670

Author SHA1 Message Date
  Jay 9df5e29670 fix 首页类方法修正 5 days ago
  Jay 920f32d104 fix 取消注释 5 days ago
  Jay f9cb5a8e53 fix 修改地图logo、名称等 5 days ago
7 changed files with 15 additions and 15 deletions
Unified View Show Diff Stats
  1. 1 1
      package.json
  2. 1 0
      public/index.html
  3. 1 0
      public/logo.svg
  4. 1 2
      src/ctrl/VectorDataManager.js
  5. 6 6
      src/index.js
  6. 1 1
      src/view/App.js
  7. 4 5
      src/view/Map.js

+ 1 - 1
package.json
View File 

@@ -1,5 +1,5 @@
 
 {
 
 {
 
-  "name": "indoor-monitor",
 
+  "name": "map-indoor",
 
   "version": "0.1.0",
 
   "version": "0.1.0",
 
   "description": "Web Monitor for showing indoors data",
 
   "description": "Web Monitor for showing indoors data",
 
   "main": "index.js",
 
   "main": "index.js",

+ 1 - 0
public/index.html
View File 

@@ -22,6 +22,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
 
 	<meta name="author" content="Adrien PAVIE (PanierAvide)" />
 
 	<meta name="author" content="Adrien PAVIE (PanierAvide)" />
 
 	<meta name="copyright" content="&copy; Adrien PAVIE 2019, Daimler AG 2019" />
 
 	<meta name="copyright" content="&copy; Adrien PAVIE 2019, Daimler AG 2019" />
 
 	<link rel="stylesheet" type="text/css" href="%PUBLIC_URL%/style.css" />
 
 	<link rel="stylesheet" type="text/css" href="%PUBLIC_URL%/style.css" />
 
+	<link rel="icon" href="%PUBLIC_URL%/logo.svg" />
 
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1" />
 
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1" />
 
 </head>
 
 </head>
 
 <body>
 
 <body>

File diff suppressed because it is too large
+ 1 - 0
public/logo.svg


+ 1 - 2
src/ctrl/VectorDataManager.js
View File 

@@ -1259,8 +1259,7 @@ class VectorDataManager extends HistorizedManager {
 
 
 
 			try {
 
 			try {
 
 				changesetId = await this._osmApi.createChangeset(
 
 				changesetId = await this._osmApi.createChangeset(
 
-					// window.EDITOR_NAME + ' ' + PACKAGE.version,
 
-					PACKAGE.name + ' ' + PACKAGE.version,
 
+					window.MAP_NAME + ' ' + PACKAGE.version,
 
 					tags.comment || "Edited building indoors",
 
 					tags.comment || "Edited building indoors",
 
 					mytags
 
 					mytags
 
 				);
 
 				);

+ 6 - 6
src/index.js
View File 

@@ -15,7 +15,7 @@ import LocationCard from './view/common/LocationCard';
 
 import POI from './view/common/POI';
 
 import POI from './view/common/POI';
 
 import HisTrackCtrl from './view/utils/historyTrackControl';
 
 import HisTrackCtrl from './view/utils/historyTrackControl';
 
 import MapUtil from './view/utils/MapUtil';
 
 import MapUtil from './view/utils/MapUtil';
 
-import connectTestTool from './view/utils/connectTestTool'
 
+import connectTestTool from './view/utils/connectTestTool';
 
 
 
 
 
 /*
 
 /*
 
@@ -30,7 +30,7 @@ window.UNUSABLE_ICONS = new Set();
 
 // 	.then(configTxt => {
 
 // 	.then(configTxt => {
 
 // 		console.log(configTxt)
 
 // 		console.log(configTxt)
 
 // 		window.CONFIG = JSON.parse(configTxt);
 
 // 		window.CONFIG = JSON.parse(configTxt);
 
-// 		window.EDITOR_NAME = window.CONFIG.editor_name;
 
+// 		window.MAP_NAME = window.CONFIG.map_name;
 
 
 
 // 		// Create app
 
 // 		// Create app
 
 // 		new App();
 
 // 		new App();
 
@@ -41,7 +41,7 @@ window.UNUSABLE_ICONS = new Set();
 
 // 	});
 
 // 	});
 
 
 
 window.CONFIG = JSON.parse(`{
 
 window.CONFIG = JSON.parse(`{
 
-	"editor_name": "飞兔地图",
 
+	"map_name": "BunnyBlitzMap",
 
 	"hash": "GIT_HASH",
 
 	"hash": "GIT_HASH",
 
 	"data_min_zoom": 18,
 
 	"data_min_zoom": 18,
 
 	"map_initial_zoom": 18,
 
 	"map_initial_zoom": 18,
 
@@ -55,10 +55,10 @@ window.CONFIG = JSON.parse(`{
 
 	"always_authenticated": false
 
 	"always_authenticated": false
 
 }`);
 
 }`);
 
 
 
-window.EDITOR_NAME = window.CONFIG.editor_name;
 
+window.MAP_NAME = window.CONFIG.map_name;
 
 
 
 
 
-// Create app
 
+// // Create app
 
 // let app = new App({ el: 'root', id: 'swa3s5ex', url:"ws://121.42.8.157:19702", origin: [39.62413679, 118.16254283] })
 
 // let app = new App({ el: 'root', id: 'swa3s5ex', url:"ws://121.42.8.157:19702", origin: [39.62413679, 118.16254283] })
 
 
 
 // // new App({ el: 'root' }).init();
 
 // // new App({ el: 'root' }).init();
 
@@ -76,10 +76,10 @@ window.EDITOR_NAME = window.CONFIG.editor_name;
 
 
 
 const BunnyBlitz = {
 
 const BunnyBlitz = {
 
 	MAP: App,
 
 	MAP: App,
 
-	connectTestTool: connectTestTool,
 
 	MapUtil: MapUtil,
 
 	MapUtil: MapUtil,
 
 	HisTrackControl: HisTrackCtrl,
 
 	HisTrackControl: HisTrackCtrl,
 
 	LocationCard: LocationCard,
 
 	LocationCard: LocationCard,
 
 	POI: POI,
 
 	POI: POI,
 
+	connectTestTool: connectTestTool,
 
 }
 
 }
 
 export { BunnyBlitz }
 
 export { BunnyBlitz }

+ 1 - 1
src/view/App.js
View File 

@@ -66,7 +66,7 @@ export default class App {
 
 	_initView() {
 
 	_initView() {
 
 		// ref={child => this.View = child}
 
 		// ref={child => this.View = child}
 
 		ReactDOM.render(<Body {...this.state} ref={child => this.View = child.map} />, document.getElementById(this.el));
 
 		ReactDOM.render(<Body {...this.state} ref={child => this.View = child.map} />, document.getElementById(this.el));
 
-		// document.title = window.EDITOR_NAME;
 
+		// document.title = window.MAP_NAME;
 
 
 
 		// Disabling context menu
 
 		// Disabling context menu
 
 		document.oncontextmenu = () => {
 
 		document.oncontextmenu = () => {

+ 4 - 5
src/view/Map.js
View File 

@@ -458,8 +458,7 @@ class MyMap extends Component {
 
 				boxZoom={false}
 
 				boxZoom={false}
 
 			>
 
 			>
 
 				<AttributionControl
 
 				<AttributionControl
 
-					// prefix={window.EDITOR_NAME + " v" + PACKAGE.version}
 
-					prefix={PACKAGE.name + " v" + PACKAGE.version}
 
+					prefix={window.MAP_NAME + " v" + PACKAGE.version}
 
 				/>
 
 				/>
 
 
 
 				<ScaleControl
 
 				<ScaleControl
 
@@ -651,7 +650,7 @@ class MyMap extends Component {
 
 		});
 
 		});
 
 
 
 		PubSub.subscribe("map.event.bind", (msg, data) => {
 
 		PubSub.subscribe("map.event.bind", (msg, data) => {
 
-			if(data.eventName === 'contextmenu'){
 
+			if (data.eventName === 'contextmenu') {
 
 				this.elem.leafletElement.addEventListener(data.eventName, data.callback);
 
 				this.elem.leafletElement.addEventListener(data.eventName, data.callback);
 
 				return;
 
 				return;
 
 			}
 
 			}
 
@@ -659,11 +658,11 @@ class MyMap extends Component {
 
 		});
 
 		});
 
 
 
 		PubSub.subscribe("map.event.unbind", (msg, data) => {
 
 		PubSub.subscribe("map.event.unbind", (msg, data) => {
 
-			if(data.eventName === 'contextmenu'){
 
+			if (data.eventName === 'contextmenu') {
 
 				this.elem.leafletElement.removeEventListener(data.eventName, data.callback);
 
 				this.elem.leafletElement.removeEventListener(data.eventName, data.callback);
 
 				return;
 
 				return;
 
 			}
 
 			}
 
-			if(!data.callback){
 
+			if (!data.callback) {
 
 				this.elem.leafletElement.off(data.eventName);
 
 				this.elem.leafletElement.off(data.eventName);
 
 				return;
 
 				return;
 
 			}
 
 			}