Update to newer plovr + related code cleaning

Author: petrsloup

.gitignore

@@ -1 +1,2 @@
 /deploy/api.js
+/plovr-*.*

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "cesium"]
 	path = cesium
 	url = https://github.com/klokantech/cesium.git
+[submodule "src-app/library"]
+	path = src-app/library
+	url = https://github.com/klokantech/javascript.git

Makefile

@@ -1,9 +1,16 @@
-PLOVR=../plovr-81ed862.jar
+PLOVR_VERSION=2.0.0
+PLOVR=plovr-$(PLOVR_VERSION).jar
 
-.PHONY: cesium
+.PHONY: plovr cesium lint webserver
 
+all: build
+plovr: $(PLOVR)
+$(PLOVR):
+	wget -q --no-check-certificate https://registry.npmjs.org/plovr/-/plovr-$(PLOVR_VERSION).tgz
+	tar -xOzf plovr-$(PLOVR_VERSION).tgz package/bin/plovr.jar > $(PLOVR)
+	rm plovr-$(PLOVR_VERSION).tgz
 serve:
-	java -jar $(PLOVR) serve -p 9810 api.json api-debug.json app.json app-debug.json
+	java -jar $(PLOVR) serve -p 9810 *.json
 build:
 	java -jar $(PLOVR) build api.json > deploy/api_nocesium.js
 	java -jar $(PLOVR) build app.json > deploy/index_nocesium.js
@@ -12,7 +19,12 @@ lint:
 	fixjsstyle --strict -r ./src-app
 	gjslint --strict -r ./src
 	gjslint --strict -r ./src-app
-soyweb:
+webserver:
 	java -jar $(PLOVR) soyweb -p 9820 --dir .
 cesium:
-	cd cesium && "./Tools/apache-ant-1.8.2/bin/ant" minify
+	git submodule init
+	git submodule update
+	cd cesium && "./Tools/apache-ant-1.8.2/bin/ant" minify
+library:
+	git submodule init
+	git submodule update

app.json

@@ -1,8 +1,8 @@
 {
   "id": "app",
 
-  "inputs": ['src-app/main.js'],
-  "paths": ['src', 'src-app'],
+  "inputs": ["src-app/main.js"],
+  "paths": ["src", "src-app", "src-app/library/src"],
 
   "externs": [
     "Cesium.externs.js"
@@ -16,10 +16,10 @@
 
   "mode": "ADVANCED",
   "level": "VERBOSE",
-  
+
   // "pretty-print": true,
   // "debug": true,
-  
+
   "checks": {
     // Unfortunately, the Closure Library violates these in many places.
     // "accessControls": "ERROR",

src-app/library

@@ -13,7 +13,7 @@ goog.require('goog.events');
 goog.require('goog.events.EventType');
 goog.require('goog.userAgent');
 
-goog.require('klokantech.Nominatim');
+goog.require('kt.Nominatim');
 goog.require('weapi.exports.App');
 
 
@@ -66,7 +66,7 @@ weapp.App = function() {
 
   var geocoderElement = /** @type {!Element} */
                         (goog.dom.getElement('geocoder'));
-  var ac = new klokantech.Nominatim(geocoderElement,
+  var ac = new kt.Nominatim(geocoderElement,
       'http://nominatim.klokantech.com/');
 
   goog.events.listen(ac, goog.ui.ac.AutoComplete.EventType.UPDATE, function(e) {

src-app/main.js

@@ -697,6 +697,7 @@ exportSymbol('WebGLEarth.Polygon.prototype.getCentroid',
 
 /**
  * @param {!function(!weapi.exports.Polygon)} callback
+ * @suppress {accessControls}
  */
 weapi.exports.Polygon.prototype.onClick = function(callback) {
   goog.events.listen(this.app.canvas, goog.events.EventType.CLICK, function(e) {