Skip to content

Commit

Permalink
Merge branch 'master' of github.com:safesoftware/fmepedia-mapnik-cont…
Browse files Browse the repository at this point in the history
…our-face-generator
  • Loading branch information
stewgeo committed Jun 17, 2014
2 parents 2f8bb71 + 124401c commit f3ef1ae
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<link rel="stylesheet" href="header.css">

<!-- FME Server Javascript API -->
<script type="text/javascript" src="http://api.fmeserver.com/js/v1/FMEServer.min.js"></script>
<script type="text/javascript" src="http://api.fmeserver.com/js/v1.1/FMEServer.js"></script>
<script type="text/javascript" src="index.js"></script>

<title>Mapnik Contour Face Generator Demo</title>
Expand Down
4 changes: 2 additions & 2 deletions www/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ var uploadedPhotoPath;

$(document).ready(function(){

var fmes = new FMEServer({
FMEServer.init({
server : fullForm.host,
token : fullForm.token
});

//Call server and get the session ID and path
fmes.getSession(fullForm.repository, fullForm.workspace, function(json){
FMEServer.getSession(fullForm.repository, fullForm.workspace, function(json){
fullForm.session = json.serviceResponse.session;
fullForm.path = json.serviceResponse.files.folder[0].path;

Expand Down

0 comments on commit f3ef1ae

Please sign in to comment.