Board index FlightGear Development Scenery

TerraMaster: a new scenery manager

Questions and discussion about enhancing and populating the FlightGear world.

Re: TerraMaster: a new scenery manager

Postby pommesschranke » Fri Aug 28, 2015 9:49 pm

massima wrote in Fri Aug 28, 2015 7:43 pm:Same happens with manual update with subversion. it stucks at version written above.


what I did (try on your own risk ... it might confuse FlightGear's built-in terrasync even more):


Code: Select all
cd Objects/e000n50/e007n51/
svn relocate http://foxtrot.mgras.net:8080/terrascenery/trunk/data/Scenery/Objects/e000n50/e007n51
svn update
Updating '.':
U    3072872.stg
U    3072840.stg
U    3072880.stg
U    3072848.stg
U    3072849.stg
U    3072864.stg
U    3072865.stg
Updated to revision 55149.


you might see this:
Code: Select all
svn update Objects/e000n50/e007n51/
svn: E155036: Please see the 'svn upgrade' command
svn: E155036: The working copy at '/SDD2/dot-fgfs/TerraSync/Objects/e000n50/e007n51'
is too old (format 10) to work with client version '1.8.8 (r1568071)' (expects format 31). You need to upgrade the working copy first.

svn upgrade Objects/e000n50/e007n51/
Upgraded 'Objects/e000n50/e007n51'


svn info before I do svn relocate:
Code: Select all
svn: E155036: Please see the 'svn upgrade' command
svn: E155036: The working copy at '/SDD2/dot-fgfs/TerraSync/Objects/e000n50/e007n50'
is too old (format 10) to work with client version '1.8.8 (r1568071)' (expects format 31). You need to upgrade the working copy first.

svn upgrade
svn info

Path: .
Working Copy Root Path: /SDD2/dot-fgfs/TerraSync/Objects/e000n50/e007n50
URL: http://terrascenery.googlecode.com/svn/trunk/data/Scenery/Objects/e000n50/e007n50
Relative URL: ^/trunk/data/Scenery/Objects/e000n50/e007n50
Repository Root: http://terrascenery.googlecode.com/svn
Repository UUID: 383cc0dc-9303-11dd-9049-4d0e41e9b215
Revision: 55138
Node Kind: directory
Schedule: normal
Last Changed Author: google@mgras.net
Last Changed Rev: 54866
Last Changed Date: 2015-06-04 12:17:02 +0200


svn info after I did svn relocate:
Code: Select all
Path: .
Working Copy Root Path: /SDD2/dot-fgfs/TerraSync/Objects/e000n50/e007n51
URL: http://foxtrot.mgras.net:8080/terrascenery/trunk/data/Scenery/Objects/e000n50/e007n51
Relative URL: ^/trunk/data/Scenery/Objects/e000n50/e007n51
Repository Root: http://foxtrot.mgras.net:8080/terrascenery
Repository UUID: 383cc0dc-9303-11dd-9049-4d0e41e9b215
Revision: 55150
Node Kind: directory
Schedule: normal
Last Changed Author: martin
Last Changed Rev: 55150
Last Changed Date: 2015-08-28 20:03:53 +0200


I have the feeling that TerraMaster uses svn and FlightGear does something else, because on a machine without TerraMaster there are no .svn Folders
and svn info gives no result.
pommesschranke
 
Posts: 1117
Joined: Sat Apr 27, 2013 8:58 pm
Location: EDLM & LJCE
Callsign: d-laser
IRC name: laserman
Version: git
OS: Linux Kubuntu 22.04

Re: TerraMaster: a new scenery manager

Postby massima » Sat Aug 29, 2015 9:10 am

You've changed the site terrascenery.google.com/.... with foxtrot.mgras.net/.... .
Simply i switched the site with (but first i entered in the Scenery folder):

Code: Select all
svn relocate http://foxtrot.mgras.net:8080/terrascenery/trunk/data/Scenery

And now everything is update.

Thank you pommesschranke.
User avatar
massima
 
Posts: 264
Joined: Sat Jan 03, 2015 7:48 pm
Location: Italy
Callsign: M-AXX
Version: 2020.4.0
OS: debian testing

Re: TerraMaster: a new scenery manager

Postby reeed » Sat Aug 29, 2015 12:40 pm

Thank you for the link to the server redirector, I didn't know about it -- where did you get it from?

As for the 'svn relocate', I suggest performing it at the root of the scenery tree, eg /SDD2/dot-fgfs/TerraSync in your case. In addition, I suggest cleaning up the entire scenery tree of .svn directories. There should only be 1 .svn directory at the root of the scenery tree.
reeed
 
Posts: 179
Joined: Sat Dec 12, 2009 6:21 am
Location: Singapore
Callsign: SQC7294

Re: TerraMaster: a new scenery manager

Postby f-ojac » Sat Aug 29, 2015 6:33 pm

Googlecode went read only, so it's not possible to push any more update to it.
The terrasync server is now http://scenery.flightgear.org/svn-server and nothing else! This will redirect FG to the nearest scenery proxy.
f-ojac
 
Posts: 1304
Joined: Fri Mar 07, 2008 10:50 am
Version: GIT
OS: GNU/Linux

Re: TerraMaster: a new scenery manager

Postby elgaton » Sat Jan 02, 2016 1:38 pm

For those that did not notice it, reeed released TerraMaster 1.2 - it uses the SVN proxy mentioned by f-ojac instead of the old Google Code URL.
NIATCA 2nd admin, regular ATC at LIPX and creator of the LIPX custom scenery
elgaton
 
Posts: 1106
Joined: Tue Mar 19, 2013 5:58 pm
Callsign: I-ELGA/LIPX_TW
Version: Git
OS: Windows + Arch Linux

Re: TerraMaster: a new scenery manager

Postby wkitty42 » Sat Jan 02, 2016 7:47 pm

thanks for posting about that, elgaton! i've been testing it since the fix was merged... so far it seems to be working OK... now to find something that has been updated since i pulled the world down back in mid-2015 ;)

currently i'm waiting on it to finish updating florida so i can go fly there... one of my initial tests was to update the south pole out to at least 6 latitudes based on the terramaster globe map... before i did that, NZSP was nothing but water and that's located right at the south pole... after the florida update is finished, i plan to take another look at the SP, too :)
"You get more air close to the ground," said Angalo. "I read that in a book. You get lots of air low down, and not much when you go up."
"Why not?" said Gurder.
"Dunno. It's frightened of heights, I guess."
User avatar
wkitty42
 
Posts: 9148
Joined: Fri Feb 20, 2015 4:46 pm
Location: central NC, USA
Callsign: wk42
Version: git next
OS: Kubuntu 20.04

Re: TerraMaster: a new scenery manager

Postby MIG29pilot » Sat Jan 09, 2016 4:35 pm

This line in Howto:Start using Git in the Wiki has made my day:
If you are looking for a newbie-friendly GUI frontend to git, you may want to take a look at SmartGit (multi-platform). See TortoiseGit for a Windows specific GUI.
User avatar
MIG29pilot
 
Posts: 1465
Joined: Tue May 19, 2015 5:03 pm
Location: 6 feet under Snow
Callsign: MIG29pilot
Version: 2020.1.3
OS: Windows 10

Re: TerraMaster: a new scenery manager

Postby Hooray » Sat Jan 09, 2016 5:10 pm

You are welcome, and obviously invited to also help extend/maintain the article, e.g. by adding screenshots to it, which you could annotate a little.
Please don't send support requests by PM, instead post your questions on the forum so that all users can contribute and benefit
Thanks & all the best,
Hooray
Help write next month's newsletter !
pui2canvas | MapStructure | Canvas Development | Programming resources
Hooray
 
Posts: 12707
Joined: Tue Mar 25, 2008 9:40 am
Pronouns: THOU

Re: TerraMaster: a new scenery manager

Postby NL-Ray » Wed May 18, 2016 9:39 pm

Anybody knows why Terramaster isn't downloading scenery any more? I get this error -> path not found: 404 Not Found (http://terrascenery.googlecode.com)
Using the latest version

Regards,
Ray
NL-Ray
 
Posts: 26
Joined: Sun Jul 20, 2014 12:31 pm
Location: Gelderland, The Netherlands
Callsign: NL-Ray
Version: 2018.1.1
OS: Linux Mint 17.3

Re: TerraMaster: a new scenery manager

Postby elgaton » Wed May 18, 2016 10:32 pm

Could you please confirm you are running the latest version (1.2)? (TerraMaster was updated for the transition from Google Code to the FlightGear SVN servers, and there is no mention of the Google Code TerraSync server anymore in the code, save for two comments.)
NIATCA 2nd admin, regular ATC at LIPX and creator of the LIPX custom scenery
elgaton
 
Posts: 1106
Joined: Tue Mar 19, 2013 5:58 pm
Callsign: I-ELGA/LIPX_TW
Version: Git
OS: Windows + Arch Linux

Re: TerraMaster: a new scenery manager

Postby Ovazor » Thu May 19, 2016 1:17 pm

I had the similar problem. It went away when I renamed the (hidden) folder called .svn in the scenery folder.
Flying the Dakota
Ovazor
 
Posts: 76
Joined: Wed Feb 12, 2014 7:53 am
Location: Finland
Callsign: OH-OVA
Version: 2020.4.0
OS: OpenSUSE LEap 15.2

Re: TerraMaster: a new scenery manager

Postby wkitty42 » Thu May 19, 2016 4:29 pm

that .svn folder should not prevent terrasync from updating... that folder was used by the terramaster svn updater tool as well as the standard command line svn tools... renaming that folder takes it away from those tools and they will have to build it all over again from the beginning if they are used again... unless you rename that folder back to .svn, of course...

FWIW: that .svn directory is the svn repository database for your terrasync repository on your machine... work has been done to add http capabilities for pulling scenery from terrasync... that work is coming along nicely and is operational in the new fgfs code in the source code repository... it doesn't use a database like the svn and git stuff does so that will allow freeing up that space used by the database once everything is enabled and in operation... it does, however, use one file per directory to store the hash values for each file and directory within the current directory...
"You get more air close to the ground," said Angalo. "I read that in a book. You get lots of air low down, and not much when you go up."
"Why not?" said Gurder.
"Dunno. It's frightened of heights, I guess."
User avatar
wkitty42
 
Posts: 9148
Joined: Fri Feb 20, 2015 4:46 pm
Location: central NC, USA
Callsign: wk42
Version: git next
OS: Kubuntu 20.04

Re: TerraMaster: a new scenery manager

Postby Ovazor » Thu May 19, 2016 9:01 pm

Should not and until now did not. However, Something in that folder seems to have caused this problem, at least in my case.

After seeing that TerraMaster did not sync but gave that 404 path not found error referring to googlecode, I first tried to download the newest version of TerraMaster. Same behavior (and version) as the one I had.

Then I hit the idea of creating a new test folder and trying to see if TerraMaster syncs one of the tiles to the new folder. Worked, so I concluded that there's something in my scenery folders that made TerraMaster fail. After trying to rename (not delete!) the .svn folder, TerraMaster synced and created a new .svn folder to the scenery folder. So, it seems that something in that folder caused the problem.
Flying the Dakota
Ovazor
 
Posts: 76
Joined: Wed Feb 12, 2014 7:53 am
Location: Finland
Callsign: OH-OVA
Version: 2020.4.0
OS: OpenSUSE LEap 15.2

Re: TerraMaster: a new scenery manager

Postby Ovazor » Thu May 19, 2016 9:04 pm

Of course, I grant that it could have been something completely else eg. on serverside, that was resolved while I was goofing around.
Flying the Dakota
Ovazor
 
Posts: 76
Joined: Wed Feb 12, 2014 7:53 am
Location: Finland
Callsign: OH-OVA
Version: 2020.4.0
OS: OpenSUSE LEap 15.2

Re: TerraMaster: a new scenery manager

Postby NL-Ray » Thu May 19, 2016 9:28 pm

elgaton wrote in Wed May 18, 2016 10:32 pm:Could you please confirm you are running the latest version (1.2)? (TerraMaster was updated for the transition from Google Code to the FlightGear SVN servers, and there is no mention of the Google Code TerraSync server anymore in the code, save for two comments.)


Yes, 1.2

Ovazor wrote in Thu May 19, 2016 9:01 pm:Should not and until now did not. However, Something in that folder seems to have caused this problem, at least in my case.

After seeing that TerraMaster did not sync but gave that 404 path not found error referring to googlecode, I first tried to download the newest version of TerraMaster. Same behavior (and version) as the one I had.

Then I hit the idea of creating a new test folder and trying to see if TerraMaster syncs one of the tiles to the new folder. Worked, so I concluded that there's something in my scenery folders that made TerraMaster fail. After trying to rename (not delete!) the .svn folder, TerraMaster synced and created a new .svn folder to the scenery folder. So, it seems that something in that folder caused the problem.


Thanks that worked for me also :D

Regards,
Ray
NL-Ray
 
Posts: 26
Joined: Sun Jul 20, 2014 12:31 pm
Location: Gelderland, The Netherlands
Callsign: NL-Ray
Version: 2018.1.1
OS: Linux Mint 17.3

PreviousNext

Return to Scenery

Who is online

Users browsing this forum: No registered users and 8 guests